diff --git a/.dependency-cruiser.cjs b/.dependency-cruiser.cjs
new file mode 100644
index 000000000..5ae114e5c
--- /dev/null
+++ b/.dependency-cruiser.cjs
@@ -0,0 +1,407 @@
+/** @type {import('dependency-cruiser').IConfiguration} */
+module.exports = {
+  forbidden: [
+    {
+      name: 'no-circular',
+      severity: 'warn',
+      comment:
+        'This dependency is part of a circular relationship. You might want to revise ' +
+        'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ',
+      from: {},
+      to: {
+        circular: true
+      }
+    },
+    {
+      name: 'no-orphans',
+      comment:
+        "This is an orphan module - it's likely not used (anymore?). Either use it or " +
+        "remove it. If it's logical this module is an orphan (i.e. it's a config file), " +
+        "add an exception for it in your dependency-cruiser configuration. By default " +
+        "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " +
+        "files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
+      severity: 'warn',
+      from: {
+        orphan: true,
+        pathNot: [
+          '(^|/)[.][^/]+[.](?:js|cjs|mjs|ts|cts|mts|json)$',                  // dot files
+          '[.]d[.]ts$',                                                       // TypeScript declaration files
+          '(^|/)tsconfig[.]json$',                                            // TypeScript config
+          '(^|/)(?:babel|webpack)[.]config[.](?:js|cjs|mjs|ts|cts|mts|json)$' // other configs
+        ]
+      },
+      to: {},
+    },
+    {
+      name: 'no-deprecated-core',
+      comment:
+        'A module depends on a node core module that has been deprecated. Find an alternative - these are ' +
+        "bound to exist - node doesn't deprecate lightly.",
+      severity: 'warn',
+      from: {},
+      to: {
+        dependencyTypes: [
+          'core'
+        ],
+        path: [
+          '^v8/tools/codemap$',
+          '^v8/tools/consarray$',
+          '^v8/tools/csvparser$',
+          '^v8/tools/logreader$',
+          '^v8/tools/profile_view$',
+          '^v8/tools/profile$',
+          '^v8/tools/SourceMap$',
+          '^v8/tools/splaytree$',
+          '^v8/tools/tickprocessor-driver$',
+          '^v8/tools/tickprocessor$',
+          '^node-inspect/lib/_inspect$',
+          '^node-inspect/lib/internal/inspect_client$',
+          '^node-inspect/lib/internal/inspect_repl$',
+          '^async_hooks$',
+          '^punycode$',
+          '^domain$',
+          '^constants$',
+          '^sys$',
+          '^_linklist$',
+          '^_stream_wrap$'
+        ],
+      }
+    },
+    {
+      name: 'not-to-deprecated',
+      comment:
+        'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' +
+        'version of that module, or find an alternative. Deprecated modules are a security risk.',
+      severity: 'warn',
+      from: {},
+      to: {
+        dependencyTypes: [
+          'deprecated'
+        ]
+      }
+    },
+    // {
+    //   name: 'no-non-package-json',
+    //   severity: 'error',
+    //   comment:
+    //     "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " +
+    //     "That's problematic as the package either (1) won't be available on live (2 - worse) will be " +
+    //     "available on live with an non-guaranteed version. Fix it by adding the package to the dependencies " +
+    //     "in your package.json.",
+    //   from: {},
+    //   to: {
+    //     dependencyTypes: [
+    //       'npm-no-pkg',
+    //       'npm-unknown'
+    //     ]
+    //   }
+    // },
+    // {
+    //   name: 'not-to-unresolvable',
+    //   comment:
+    //     "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " +
+    //     'module: add it to your package.json. In all other cases you likely already know what to do.',
+    //   severity: 'error',
+    //   from: {},
+    //   to: {
+    //     couldNotResolve: true
+    //   }
+    // },
+    {
+      name: 'no-duplicate-dep-types',
+      comment:
+        "Likely this module depends on an external ('npm') package that occurs more than once " +
+        "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " +
+        "maintenance problems later on.",
+      severity: 'warn',
+      from: {},
+      to: {
+        moreThanOneDependencyType: true,
+        // as it's pretty common to have a type import be a type only import 
+        // _and_ (e.g.) a devDependency - don't consider type-only dependency
+        // types for this rule
+        dependencyTypesNot: ["type-only"]
+      }
+    },
+
+    /* rules you might want to tweak for your specific situation: */
+    
+    {
+      name: 'not-to-spec',
+      comment:
+        'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' +
+        "If there's something in a spec that's of use to other modules, it doesn't have that single " +
+        'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.',
+      severity: 'error',
+      from: {},
+      to: {
+        path: '[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$'
+      }
+    },
+    {
+      name: 'not-to-dev-dep',
+      severity: 'error',
+      comment:
+        "This module depends on an npm package from the 'devDependencies' section of your " +
+        'package.json. It looks like something that ships to production, though. To prevent problems ' +
+        "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" +
+        'section of your package.json. If this module is development only - add it to the ' +
+        'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration',
+      from: {
+        path: '^(packages|apps)',
+        pathNot: [ 
+          '^packages/eslint-config',
+          '^packages/prettier-config',
+          'apps/nextjs/tailwind.config.cjs',
+          'jest[.]config[.](js|mjs|cjs|ts)$',
+          '[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$',
+          '(^|/)__tests__/',
+          '(^|/)test/',
+          '(^|/)tests/',
+          '(^|/)tests-e2e/'
+        ]
+      },
+      to: {
+        dependencyTypes: [
+          'npm-dev',
+        ],
+        // type only dependencies are not a problem as they don't end up in the
+        // production code or are ignored by the runtime.
+        dependencyTypesNot: [
+          'type-only'
+        ],
+        pathNot: [
+          'node_modules/@types/'
+        ]
+      }
+    },
+    {
+      name: 'optional-deps-used',
+      severity: 'info',
+      comment:
+        "This module depends on an npm package that is declared as an optional dependency " +
+        "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
+        "If you're using an optional dependency here by design - add an exception to your" +
+        "dependency-cruiser configuration.",
+      from: {},
+      to: {
+        dependencyTypes: [
+          'npm-optional'
+        ]
+      }
+    },
+    {
+      name: 'peer-deps-used',
+      comment:
+        "This module depends on an npm package that is declared as a peer dependency " +
+        "in your package.json. This makes sense if your package is e.g. a plugin, but in " +
+        "other cases - maybe not so much. If the use of a peer dependency is intentional " +
+        "add an exception to your dependency-cruiser configuration.",
+      severity: 'warn',
+      from: {},
+      to: {
+        dependencyTypes: [
+          'npm-peer'
+        ]
+      }
+    }
+  ],
+  options: {
+    
+    /* Which modules not to follow further when encountered */
+    doNotFollow: {
+      /* path: an array of regular expressions in strings to match against */
+      path: ['(^|/)node_modules/','node_modules', '(^|/)dist/', '(^|/)build/', '(^|/)out/']
+    },
+
+    /* Which modules to exclude */
+    exclude : {
+      /* path: an array of regular expressions in strings to match against */
+      path: [
+        '^apps/nextjs/playwright-report',
+        '(^|/)\\.turbo/',
+        '(^|/)\\.github/',
+        '(^|/)coverage/',
+        '(^|/)\\.next/',
+        '(^|/)\\.storybook/',
+        '\\.test\\.(js|ts|jsx|tsx)$',
+        '\\.spec\\.(js|ts|jsx|tsx)$',
+        '\\.stories\\.(js|ts|jsx|tsx)$'
+      ]
+    },
+
+    /* Which modules to exclusively include (array of regular expressions in strings)
+       dependency-cruiser will skip everything not matching this pattern
+    */
+    // includeOnly : [''],
+
+    /* List of module systems to cruise.
+       When left out dependency-cruiser will fall back to the list of _all_
+       module systems it knows of. It's the default because it's the safe option
+       It might come at a performance penalty, though.
+       moduleSystems: ['amd', 'cjs', 'es6', 'tsd']
+      
+       As in practice only commonjs ('cjs') and ecmascript modules ('es6')
+       are widely used, you can limit the moduleSystems to those.
+     */
+    
+    // moduleSystems: ['cjs', 'es6'],
+
+    /* 
+      false: don't look at JSDoc imports (the default)
+      true: dependency-cruiser will detect dependencies in JSDoc-style
+      import statements. Implies "parser": "tsc", so the dependency-cruiser
+      will use the typescript parser for JavaScript files.
+     
+      For this to work the typescript compiler will need to be installed in the
+      same spot as you're running dependency-cruiser from.
+     */
+    // detectJSDocImports: true,
+
+    /* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/main/'
+       to open it on your online repo or `vscode://file/${process.cwd()}/` to 
+       open it in visual studio code),
+     */
+    // prefix: `vscode://file/${process.cwd()}/`,
+
+    /* false (the default): ignore dependencies that only exist before typescript-to-javascript compilation
+       true: also detect dependencies that only exist before typescript-to-javascript compilation
+       "specify": for each dependency identify whether it only exists before compilation or also after
+     */
+    tsPreCompilationDeps: true,
+    
+    /* list of extensions to scan that aren't javascript or compile-to-javascript.
+       Empty by default. Only put extensions in here that you want to take into
+       account that are _not_ parsable.
+    */
+    // extraExtensionsToScan: [".json", ".jpg", ".png", ".svg", ".webp"],
+
+    /* if true combines the package.jsons found from the module up to the base
+       folder the cruise is initiated from. Useful for how (some) mono-repos
+       manage dependencies & dependency definitions.
+     */
+    // combinedDependencies: false,
+
+    /* if true leave symlinks untouched, otherwise use the realpath */
+    // preserveSymlinks: false,
+
+    /* TypeScript project file ('tsconfig.json') to use for
+       (1) compilation and
+       (2) resolution (e.g. with the paths property)
+
+       The (optional) fileName attribute specifies which file to take (relative to
+       dependency-cruiser's current working directory). When not provided
+       defaults to './tsconfig.json'.
+     */
+    tsConfig: {
+      fileName: 'tsconfig.json'
+    },
+
+    /* Webpack configuration to use to get resolve options from.
+
+       The (optional) fileName attribute specifies which file to take (relative
+       to dependency-cruiser's current working directory. When not provided defaults
+       to './webpack.conf.js'.
+
+       The (optional) `env` and `arguments` attributes contain the parameters
+       to be passed if your webpack config is a function and takes them (see 
+        webpack documentation for details)
+     */
+    // webpackConfig: {
+    //  fileName: 'webpack.config.js',
+    //  env: {},
+    //  arguments: {}
+    // },
+
+    /* Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use
+      for compilation
+     */
+    // babelConfig: {
+    //   fileName: '.babelrc',
+    // },
+
+    /* List of strings you have in use in addition to cjs/ es6 requires
+       & imports to declare module dependencies. Use this e.g. if you've
+       re-declared require, use a require-wrapper or use window.require as
+       a hack.
+    */
+    // exoticRequireStrings: [],
+    
+    /* options to pass on to enhanced-resolve, the package dependency-cruiser
+       uses to resolve module references to disk. The values below should be
+       suitable for most situations
+
+       If you use webpack: you can also set these in webpack.conf.js. The set
+       there will override the ones specified here.
+     */
+    enhancedResolveOptions: {
+      /* What to consider as an 'exports' field in package.jsons */ 
+      exportsFields: ["exports"],
+      /* List of conditions to check for in the exports field.
+         Only works when the 'exportsFields' array is non-empty.
+      */
+      conditionNames: ["import", "require", "node", "default", "types"],
+      /*
+         The extensions, by default are the same as the ones dependency-cruiser
+         can access (run `npx depcruise --info` to see which ones that are in
+         _your_ environment). If that list is larger than you need you can pass
+         the extensions you actually use (e.g. [".js", ".jsx"]). This can speed
+         up module resolution, which is the most expensive step.
+       */
+      // extensions: [".js", ".jsx", ".ts", ".tsx", ".d.ts"],
+      /* What to consider a 'main' field in package.json */
+      mainFields: ["module", "main", "types", "typings"],
+      /*
+         A list of alias fields in package.jsons
+         See [this specification](https://github.com/defunctzombie/package-browser-field-spec) and
+         the webpack [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields)
+         documentation 
+         
+         Defaults to an empty array (= don't use alias fields).
+       */
+      // aliasFields: ["browser"],
+    },
+    reporterOptions: {
+      dot: {
+        /* pattern of modules that can be consolidated in the detailed
+           graphical dependency graph. The default pattern in this configuration
+           collapses everything in node_modules to one folder deep so you see
+           the external modules, but their innards.
+         */
+        collapsePattern: 'node_modules/(?:@[^/]+/[^/]+|[^/]+)',
+
+        /* Options to tweak the appearance of your graph.See
+           https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions
+           for details and some examples. If you don't specify a theme
+           dependency-cruiser falls back to a built-in one.
+        */
+        // theme: {
+        //   graph: {
+        //     /* splines: "ortho" gives straight lines, but is slow on big graphs
+        //        splines: "true" gives bezier curves (fast, not as nice as ortho)
+        //    */
+        //     splines: "true"
+        //   },
+        // }
+      },
+      archi: {
+        /* pattern of modules that can be consolidated in the high level
+          graphical dependency graph. If you use the high level graphical
+          dependency graph reporter (`archi`) you probably want to tweak
+          this collapsePattern to your situation.
+        */
+        collapsePattern: '^(?:packages|src|lib(s?)|app(s?)|bin|test(s?)|spec(s?))/[^/]+|node_modules/(?:@[^/]+/[^/]+|[^/]+)',
+
+        /* Options to tweak the appearance of your graph. If you don't specify a
+           theme for 'archi' dependency-cruiser will use the one specified in the
+           dot section above and otherwise use the default one.
+         */
+        // theme: { },
+      },
+      "text": {
+        "highlightFocused": true
+      },
+    }
+  }
+};
+// generated: dependency-cruiser@16.7.0 on 2024-12-10T09:31:39.848Z
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
deleted file mode 100644
index 8e608153e..000000000
--- a/.eslintrc.cjs
+++ /dev/null
@@ -1,13 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  root: true,
-  extends: ["eslint-config-custom"],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: [
-      "./tsconfig.json",
-      "./apps/*/tsconfig.json",
-      "./packages/*/tsconfig.json",
-    ],
-  },
-};
diff --git a/.github/actions/ref_from_sha/action.yml b/.github/actions/ref_from_sha/action.yml
index a589b58af..06e9edcc4 100644
--- a/.github/actions/ref_from_sha/action.yml
+++ b/.github/actions/ref_from_sha/action.yml
@@ -13,4 +13,4 @@ outputs:
     description: "The number of the PR if one is found"
 runs:
   using: "node20"
-  main: "index.js"
+  main: "index.cjs"
diff --git a/.github/actions/ref_from_sha/branch_from_sha.js b/.github/actions/ref_from_sha/branch_from_sha.cjs
similarity index 100%
rename from .github/actions/ref_from_sha/branch_from_sha.js
rename to .github/actions/ref_from_sha/branch_from_sha.cjs
diff --git a/.github/actions/ref_from_sha/index.js b/.github/actions/ref_from_sha/index.cjs
similarity index 95%
rename from .github/actions/ref_from_sha/index.js
rename to .github/actions/ref_from_sha/index.cjs
index 9356f47e3..393ca3ef3 100644
--- a/.github/actions/ref_from_sha/index.js
+++ b/.github/actions/ref_from_sha/index.cjs
@@ -8,8 +8,8 @@
 const core = require("@actions/core");
 const github = require("@actions/github");
 
-const prFromSha = require("./pr_from_sha");
-const branchFromSha = require("./branch_from_sha");
+const prFromSha = require("./pr_from_sha.cjs");
+const branchFromSha = require("./branch_from_sha.cjs");
 
 async function run() {
   try {
diff --git a/.github/actions/ref_from_sha/pr_from_sha.js b/.github/actions/ref_from_sha/pr_from_sha.cjs
similarity index 100%
rename from .github/actions/ref_from_sha/pr_from_sha.js
rename to .github/actions/ref_from_sha/pr_from_sha.cjs
diff --git a/.github/actions/ref_from_sha/test/e2e.js b/.github/actions/ref_from_sha/test/e2e.cjs
similarity index 90%
rename from .github/actions/ref_from_sha/test/e2e.js
rename to .github/actions/ref_from_sha/test/e2e.cjs
index 66d036752..475e3933a 100644
--- a/.github/actions/ref_from_sha/test/e2e.js
+++ b/.github/actions/ref_from_sha/test/e2e.cjs
@@ -1,7 +1,7 @@
 const github = require("@actions/github");
 
-const prFromSha = require("../pr_from_sha");
-const branchFromSha = require("../branch_from_sha");
+const prFromSha = require("../pr_from_sha.cjs");
+const branchFromSha = require("../branch_from_sha.cjs");
 
 const githubToken = process.env.GITHUB_TOKEN;
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e60d78164..99ed5a7a7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -32,6 +32,9 @@ jobs:
       - name: Install deps (with cache)
         run: pnpm install
 
+      - name: Prisma generate (no engine)
+        run: pnpm turbo db-generate:no-engine --cache-dir=".turbo"
+
       - name: Build, lint and type-check
         run: pnpm turbo lint type-check --cache-dir=".turbo"
 
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 5195a8f95..36f0fb30b 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -38,8 +38,17 @@ jobs:
           doppler-token: ${{ secrets.DOPPLER_TOKEN }}
           inject-env-vars: true
 
+      - name: Get App Version
+        id: app-version
+        run: |
+          APP_VERSION=$(grep -m 1 -oP '(?<=## \[)\d+\.\d+\.\d+' CHANGE_LOG.md)
+          echo "version=$APP_VERSION" >> $GITHUB_OUTPUT
+
       - name: SonarCloud scan
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ steps.doppler.outputs.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.projectVersion=${{ steps.app-version.outputs.version }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cad1aa60e..149fec4e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,4 +43,15 @@ jobs:
           inject-env-vars: true
 
       - name: Run tests
-        run: pnpm turbo test --cache-dir=".turbo" -- --maxWorkers=33%
+        run: pnpm turbo test --cache-dir=".turbo" -- --maxWorkers=33% --coverage
+
+      # Run only on production branch
+      - name: Report coverage to SonarCloud
+        if: ${{ github.event.pull_request.merged == true && github.base_ref == 'production' }}
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.javascript.lcov.reportPaths=packages/**/coverage/lcov.info,apps/nextjs/coverage/lcov.info
diff --git a/.gitignore b/.gitignore
index 8b123713e..f71235e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,9 @@ yarn-error.log*
 
 # Allow each developer to have personal settings, but ignore these files
 .vscode/launch.json 
-.vscode/*.settings.json
\ No newline at end of file
+.vscode/*.settings.json
+
+.sonar
+.sonar/**/*
+
+dependency-graph.svg
\ No newline at end of file
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index e9af3c6cd..80e519a17 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,6 +5,7 @@
     "bradlc.vscode-tailwindcss",
     "Prisma.prisma",
     "orta.vscode-jest",
-    "ms-playwright.playwright"
+    "ms-playwright.playwright",
+    "sonarsource.sonarlint-vscode"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 97cf21f98..b333aa0d7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -12,7 +12,17 @@
   ],
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,
+  "cSpell.ignorePaths": [
+    "pnpm-lock.json",
+    "node_modules",
+    "vscode-extension",
+    ".git/{info,lfs,logs,refs,objects}/**",
+    ".git/{index,*refs,*HEAD}",
+    ".vscode",
+    ".vscode-insiders"
+  ],
   "cSpell.words": [
+    "agentic",
     "Aila",
     "APIV",
     "authed",
@@ -33,21 +43,27 @@
     "COLOR",
     "compat",
     "contrib",
+    "corejs",
     "cuid",
     "dashify",
     "datadoghq",
+    "datamodel",
     "dialog",
     "Dialogs",
     "distractor",
     "distractors",
+    "dmmf",
     "Docgen",
     "dockerized",
     "dopplerhq",
     "dotenv",
+    "Dsonar",
     "EASS",
+    "Edtech",
     "EHRC",
     "estree",
     "estruyf",
+    "evenodd",
     "eyfs",
     "firstname",
     "fkey",
@@ -72,6 +88,7 @@
     "initialisation",
     "initialise",
     "inngest",
+    "ipcountry",
     "Jayne",
     "jsonparse",
     "jsonrepair",
@@ -90,8 +107,10 @@
     "moderations",
     "multilogical",
     "NDJSON",
+    "Neue",
     "nextjs",
     "nocheck",
+    "Noto",
     "Nullability",
     "oakai",
     "oaknational",
@@ -123,6 +142,7 @@
     "psql",
     "pusherapp",
     "ratelimit",
+    "rect",
     "refs",
     "Regen",
     "remeda",
@@ -131,11 +151,18 @@
     "RSHE",
     "rushstack",
     "Sedar",
+    "Segoe",
     "slidedeck",
+    "sonarcloud",
+    "sonarqube",
+    "sonarsource",
+    "sslcert",
     "sslmode",
     "SUBJ",
     "superjson",
     "svgs",
+    "svix",
+    "systemjs",
     "tailwindcss",
     "tanstack",
     "testid",
@@ -144,6 +171,7 @@
     "thenational",
     "tiktoken",
     "timeframe",
+    "transferrables",
     "transpiles",
     "trivago",
     "trpc",
diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
index 4da1950e8..e7fb418c6 100644
--- a/CHANGE_LOG.md
+++ b/CHANGE_LOG.md
@@ -1,3 +1,82 @@
+# [1.19.0](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.18.2...v1.19.0) (2024-12-18)
+
+
+### Bug Fixes
+
+* sonar duplication ([#397](https://github.com/oaknational/oak-ai-lesson-assistant/issues/397)) ([dea3106](https://github.com/oaknational/oak-ai-lesson-assistant/commit/dea3106d249119169e515d7ccebc827f324bdbf3))
+
+
+### Features
+
+* soft delete ([#383](https://github.com/oaknational/oak-ai-lesson-assistant/issues/383)) ([9dee4ad](https://github.com/oaknational/oak-ai-lesson-assistant/commit/9dee4adb840a0a5d96e43f02349ad04597862539))
+
+## [1.18.2](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.18.1...v1.18.2) (2024-12-17)
+
+## [1.18.1](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.18.0...v1.18.1) (2024-12-16)
+
+
+### Bug Fixes
+
+* improve chances of showing 5 relevant plans ([#444](https://github.com/oaknational/oak-ai-lesson-assistant/issues/444)) ([4955a1e](https://github.com/oaknational/oak-ai-lesson-assistant/commit/4955a1e35fad9345de01ce9b831747059a95c579))
+* posthog consistent event properties ([#440](https://github.com/oaknational/oak-ai-lesson-assistant/issues/440)) ([7c24485](https://github.com/oaknational/oak-ai-lesson-assistant/commit/7c24485f6604cc9a13a0a24058dd5f5a1b0f972e))
+* remove key from chat provider ([#431](https://github.com/oaknational/oak-ai-lesson-assistant/issues/431)) ([35141b3](https://github.com/oaknational/oak-ai-lesson-assistant/commit/35141b3305ac7830feeb7269e8ee1f2611368c9a))
+* temporarily disable no unsafe rules ([#429](https://github.com/oaknational/oak-ai-lesson-assistant/issues/429)) ([a8ada5d](https://github.com/oaknational/oak-ai-lesson-assistant/commit/a8ada5d008188ea3064476a431b041165fad6e81))
+
+# [1.18.0](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.17.1...v1.18.0) (2024-12-11)
+
+
+### Bug Fixes
+
+*  update eslint config and lint errors ([#422](https://github.com/oaknational/oak-ai-lesson-assistant/issues/422)) ([34774b5](https://github.com/oaknational/oak-ai-lesson-assistant/commit/34774b5b404c154d8c8aa10ae5b687507dc09c85))
+* moderation persist scores [AI-696] ([#418](https://github.com/oaknational/oak-ai-lesson-assistant/issues/418)) ([7539661](https://github.com/oaknational/oak-ai-lesson-assistant/commit/7539661e22fa0e334138e0f796a700662e4e37e3))
+* more flexible and efficient solution for images in docs ([#411](https://github.com/oaknational/oak-ai-lesson-assistant/issues/411)) ([abbff85](https://github.com/oaknational/oak-ai-lesson-assistant/commit/abbff8545476f6c045331a63290fc8f57cf3f54e))
+* upgrade typescript + prettier + eslint with a single shared linting config ([#424](https://github.com/oaknational/oak-ai-lesson-assistant/issues/424)) ([1f4aa9d](https://github.com/oaknational/oak-ai-lesson-assistant/commit/1f4aa9dde84402df089ce4d6947472d389f576a0))
+
+
+### Features
+
+* report google drive storage quota ([#425](https://github.com/oaknational/oak-ai-lesson-assistant/issues/425)) ([a0cb485](https://github.com/oaknational/oak-ai-lesson-assistant/commit/a0cb4859ddb975d831a5b64d8d789ee8597aeda8))
+* test coverage ([#406](https://github.com/oaknational/oak-ai-lesson-assistant/issues/406)) ([00767a0](https://github.com/oaknational/oak-ai-lesson-assistant/commit/00767a0148456f57f8fa21e0cb0149cf849f3574))
+
+## [1.17.1](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.17.0...v1.17.1) (2024-12-03)
+
+
+### Bug Fixes
+
+* add linting command to db package ([#392](https://github.com/oaknational/oak-ai-lesson-assistant/issues/392)) ([d2177d5](https://github.com/oaknational/oak-ai-lesson-assistant/commit/d2177d5c061e973affd1ea52b0ef025c8c37cb29))
+* address sonar major issues ([#393](https://github.com/oaknational/oak-ai-lesson-assistant/issues/393)) ([202a21f](https://github.com/oaknational/oak-ai-lesson-assistant/commit/202a21fbac0d457514c9944735b174c79dced08c))
+* do not define components inline ([#413](https://github.com/oaknational/oak-ai-lesson-assistant/issues/413)) ([abda175](https://github.com/oaknational/oak-ai-lesson-assistant/commit/abda1753afecd9385b19b695767568abdd4383c1))
+* do not use array index for key / use void for onSubmit ([#409](https://github.com/oaknational/oak-ai-lesson-assistant/issues/409)) ([44b5961](https://github.com/oaknational/oak-ai-lesson-assistant/commit/44b59617f3af8cad83110efdc2cb4df23d06e073))
+* help page cloudflare email ([#399](https://github.com/oaknational/oak-ai-lesson-assistant/issues/399)) ([f6262f2](https://github.com/oaknational/oak-ai-lesson-assistant/commit/f6262f26d470a30ea721343bbab2cbfded77b91d))
+* high and medium severity bugs on sonar cloud - AI-637 ([#379](https://github.com/oaknational/oak-ai-lesson-assistant/issues/379)) ([fb0258e](https://github.com/oaknational/oak-ai-lesson-assistant/commit/fb0258ec2f3c0d5fb79d884d3918827460cba404))
+* icons in dialogs ([#398](https://github.com/oaknational/oak-ai-lesson-assistant/issues/398)) ([9700214](https://github.com/oaknational/oak-ai-lesson-assistant/commit/970021462a94b800dba270130f5ba1b1548e8745))
+* intentionality of async / promise code for question generation ([#402](https://github.com/oaknational/oak-ai-lesson-assistant/issues/402)) ([65d1c5f](https://github.com/oaknational/oak-ai-lesson-assistant/commit/65d1c5f89c1b238e24315c02bde2e9eb253b4da3))
+* memoize the sidebar context provider's value ([#408](https://github.com/oaknational/oak-ai-lesson-assistant/issues/408)) ([60ee010](https://github.com/oaknational/oak-ai-lesson-assistant/commit/60ee0102ea1ee733d6527c5460fd404cd7773292))
+* minor sonar issues ([#390](https://github.com/oaknational/oak-ai-lesson-assistant/issues/390)) ([015cd25](https://github.com/oaknational/oak-ai-lesson-assistant/commit/015cd25984c3e5d1a545afef39fd111aa5245d58))
+* prefer nullish coalescing ([#391](https://github.com/oaknational/oak-ai-lesson-assistant/issues/391)) ([b40def9](https://github.com/oaknational/oak-ai-lesson-assistant/commit/b40def9cfd3d69a0089db861a2f6ed47321a3753))
+* readonly props for icons.tsx ([#389](https://github.com/oaknational/oak-ai-lesson-assistant/issues/389)) ([7b4d5bc](https://github.com/oaknational/oak-ai-lesson-assistant/commit/7b4d5bcc508b3179ea5313ec783aba90d1a7f3ae))
+* revert tabindex change ([#404](https://github.com/oaknational/oak-ai-lesson-assistant/issues/404)) ([ac72713](https://github.com/oaknational/oak-ai-lesson-assistant/commit/ac72713dc54595f6bfacfd99e63899616f18b8ec))
+* sonar maintain issues [#4](https://github.com/oaknational/oak-ai-lesson-assistant/issues/4) ([#405](https://github.com/oaknational/oak-ai-lesson-assistant/issues/405)) ([eca0019](https://github.com/oaknational/oak-ai-lesson-assistant/commit/eca001996a684f8d01465196c1c600d00e43a964))
+* sonar maintain linting [#1](https://github.com/oaknational/oak-ai-lesson-assistant/issues/1) ([#394](https://github.com/oaknational/oak-ai-lesson-assistant/issues/394)) ([f4d95fc](https://github.com/oaknational/oak-ai-lesson-assistant/commit/f4d95fcbf39c3c43c3811f8c2022a37af363826a))
+* sonar maintain linting [#2](https://github.com/oaknational/oak-ai-lesson-assistant/issues/2) ([#395](https://github.com/oaknational/oak-ai-lesson-assistant/issues/395)) ([1ed9d60](https://github.com/oaknational/oak-ai-lesson-assistant/commit/1ed9d6028713b096a68a0558d67608dc9efb812f))
+* sonar maintain linting [#3](https://github.com/oaknational/oak-ai-lesson-assistant/issues/3) ([#403](https://github.com/oaknational/oak-ai-lesson-assistant/issues/403)) ([daa7efe](https://github.com/oaknational/oak-ai-lesson-assistant/commit/daa7efe6a2d5d2501f5108cd3c1ccaec86126655))
+* sonar minors [#5](https://github.com/oaknational/oak-ai-lesson-assistant/issues/5) ([#414](https://github.com/oaknational/oak-ai-lesson-assistant/issues/414)) ([5f749f4](https://github.com/oaknational/oak-ai-lesson-assistant/commit/5f749f42f9f5d3d78c736438e313f4f5eff5406b))
+
+# [1.17.0](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.16.2...v1.17.0) (2024-11-28)
+
+
+### Bug Fixes
+
+* assert readonly props ([#381](https://github.com/oaknational/oak-ai-lesson-assistant/issues/381)) ([cd88576](https://github.com/oaknational/oak-ai-lesson-assistant/commit/cd88576c5a337ad30f48783d74ea45d746a60956))
+* help page cloudflare email ([#399](https://github.com/oaknational/oak-ai-lesson-assistant/issues/399)) ([391b67c](https://github.com/oaknational/oak-ai-lesson-assistant/commit/391b67c27a4048d4e422be22226d8d5aa1ac71bd))
+* minor linting ([#384](https://github.com/oaknational/oak-ai-lesson-assistant/issues/384)) ([ec4ce6e](https://github.com/oaknational/oak-ai-lesson-assistant/commit/ec4ce6e5dcc7dbd4e242be65fd3b5f9708b94a40))
+* svg clip-rule should be clipRule in JSX ([#382](https://github.com/oaknational/oak-ai-lesson-assistant/issues/382)) ([610d8c8](https://github.com/oaknational/oak-ai-lesson-assistant/commit/610d8c838273de24212a8531a8bc4b6136c05db1))
+
+
+### Features
+
+* move delete all button and restyle side menu ([#375](https://github.com/oaknational/oak-ai-lesson-assistant/issues/375)) ([69b2371](https://github.com/oaknational/oak-ai-lesson-assistant/commit/69b2371bf9ee7e7f783aa191ba6932dba0171837))
+
 ## [1.16.2](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.16.1...v1.16.2) (2024-11-25)
 
 
diff --git a/README.md b/README.md
index fb3ee86ba..52b6c5a00 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,16 @@ Oak AI Lesson Assistant is a project focused on experimenting with AI models and
     - [End-to-end tests](#end-to-end-tests)
       - [Playwright tags](#playwright-tags)
     - [Testing in VSCode](#testing-in-vscode)
+  - [Standards](#standards)
+    - [Typescript](#typescript)
+    - [ES Modules](#esmodules)
+    - [CommonJS](#commonjs)
+  - [Code quality](#quality)
+    - [Sonar](#sonar)
+    - [ESLint](#eslint)
+    - [Prettier](#prettier)
+    - [Tsconfig]("#tsconfig)
+    - [Dependency cruiser](#dependency-cruiser)
   - [Release process](#release-process)
   - [PNPM / dependency problems](#pnpm--dependency-problems)
   - [External contributions](#external-contributions)
@@ -176,6 +186,68 @@ Our Playwright tests are organised with tags:
 
 Install the Jest and Playwright extensions recommended in the workspace config. Testing icons should appear in the gutter to the left of each test when viewing a test file. Clicking the icon will run the test. The testing tab in the VSCode nav bar provides an overview.
 
+## Standards
+
+### Typescript
+
+By default, we develop in Typescript and aim to be up to date with the latest version. New code should default to being written in Typescript unless it is not possible.
+
+### ES Modules
+
+All packages are configured to be ES Modules.
+
+### CommonJS
+
+Currently NextJS, Tailwind and some other tools has some code which needs to be CommonJS. For these files, you should use the .cjs extension so that the correct linting rules are applied.
+
+## Code quality
+
+We use several tools to ensure code quality in the codebase and for checks during development. These checks run on each PR in Github to ensure we maintain good code quality. You can also run many of these checks locally before making a PR.
+
+### Sonar
+
+If you are using VS Code or Cursor, consider installing the SonarQube for IDE extension. This will give you feedback while you were as to any code quality or security issues that it has detected.
+
+If you would like to run a Sonar scan locally, use the following command:
+
+```shell
+pnpm sonar
+```
+
+You will need to log in to Sonar when prompted the first time. This will generate a full report for you of your local development environment. Usually it is easier to make a PR and have this run for you automatically.
+
+### ESLint
+
+We have a single ESLint config for the whole monorepo. You will find it in packages/eslint-config.
+
+This is using the latest version of ESLint and you should note that the config file format has changed to the "Flat file" config in version 9.
+
+Each package does not have its own ESLint config by default. Instead we have a single config file, with regex path matchers to turn on/off rules that are specific for each package. This can be overridden and you can see an example of that in the logger package.
+
+Each package specifies in its package.json file that it should use this shared config and there is a root ESLint config file for the whole mono repo which specifies that it should do the same.
+
+To check for linting errors, run the following command:
+
+```shell
+pnpm lint
+```
+
+If you want to check for linting errors in an individual package, cd into that package and run the same command.
+
+### Prettier
+
+We also have a single Prettier config, which is located in packages/prettier-config. In general there should be no need to change this on a per-package basis.
+
+### Tsconfig
+
+We have an overall tsconfig.json file which specifies the overall Typescript configuration for the project. Then each package extends from it.
+
+You can check the codebase for any Typescript issues by running the following command:
+
+```shell
+pnpm type-check
+```
+
 ## Release process
 
 The current release process is fully documented [in Notion](https://www.notion.so/oaknationalacademy/Branch-Strategy-and-Release-Process-ceeb32937af0426ba495565288e18844?pvs=4), but broadly works as follows:
diff --git a/apps/nextjs/.eslintrc.cjs b/apps/nextjs/.eslintrc.cjs
deleted file mode 100644
index 36eabc292..000000000
--- a/apps/nextjs/.eslintrc.cjs
+++ /dev/null
@@ -1,23 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["../../.eslintrc.cjs", "next", "plugin:storybook/recommended"],
-  rules: {
-    "react/prefer-read-only-props": "error",
-    "no-restricted-imports": [
-      "error",
-      {
-        paths: [
-          {
-            name: "posthog-js/react",
-            importNames: ["usePostHog"],
-            message:
-              "usePostHog doesn't support multiple PostHog instances, use useAnalytics instead",
-          },
-        ],
-      },
-    ],
-  },
-  parserOptions: {
-    project: __dirname + "/tsconfig.json",
-  },
-};
diff --git a/apps/nextjs/.storybook/chromatic.ts b/apps/nextjs/.storybook/chromatic.ts
new file mode 100644
index 000000000..bc755b188
--- /dev/null
+++ b/apps/nextjs/.storybook/chromatic.ts
@@ -0,0 +1,91 @@
+import "@storybook/csf";
+
+type ChromaticModes = "mobile" | "mobile-wide" | "desktop" | "desktop-wide";
+
+export function chromaticParams(modes: ChromaticModes[]) {
+  return {
+    chromatic: {
+      modes: {
+        ...(modes.includes("mobile") && {
+          mobile: { viewport: "mobile" },
+        }),
+        ...(modes.includes("mobile-wide") && {
+          mobile: { viewport: "mobile-wide" },
+        }),
+        ...(modes.includes("desktop") && {
+          desktop: { viewport: "desktop" },
+        }),
+        ...(modes.includes("desktop-wide") && {
+          "desktop-wide": { viewport: "desktopWide" },
+        }),
+      },
+    },
+  };
+}
+
+declare module "@storybook/csf" {
+  interface Parameters {
+    /**
+     * Parameters for chromatic
+     */
+    chromatic?: {
+      /**
+       * Delay capture for a fixed time (in milliseconds) to allow your story to get into
+       * the intended state
+       *
+       * @see [delaying snapshots chromatic documentation](https://www.chromatic.com/docs/delay)
+       */
+      delay?: number;
+      /**
+       * Override this behavior in instances where a single pixel change is not flagged by
+       * Chromatic but should be
+       *
+       * * @see [anti-aliasing chromatic documentation](https://www.chromatic.com/docs/threshold#anti-aliasing)
+       *
+       * @default false
+       */
+      diffIncludeAntiAliasing?: boolean;
+      /**
+       * The diffThreshold parameter allows you to fine tune the threshold for visual change
+       * between snapshots before they're flagged by Chromatic. Sometimes you need assurance
+       * to the sub-pixel and other times you want to skip visual noise generated by
+       * non-deterministic rendering such as anti-aliasing.
+       *
+       * 0 is the most accurate. 1 is the least accurate.
+       *
+       * @default 0.063
+       */
+      diffThreshold?: number;
+      /**
+       * You can omit stories entirely from Chromatic testing using the disable story parameter.
+       *
+       * @see [ignoring elements chromatic documentation](https://www.chromatic.com/docs/ignoring-elements)
+       */
+      disable?: boolean;
+      /**
+       * Modes
+       *
+       * @see [modes chromatic documentation](https://www.chromatic.com/docs/modes)
+       */
+      modes?: Record<
+        string,
+        {
+          viewport?: string | number;
+          theme?: "light" | "dark";
+          backgrounds?: { value: string };
+        }
+      >;
+      /**
+       * Define one or more viewport sizes to capture. Note, units are considered in pixels
+       */
+      viewports?: number[];
+      /**
+       * To specify that Chromatic should pause the animation at the end instead of reseting
+       * them to their beginning state.
+       *
+       * @see [animations chromatic documentation](https://www.chromatic.com/docs/animations)
+       */
+      pauseAnimationAtEnd?: boolean;
+    };
+  }
+}
diff --git a/apps/nextjs/.storybook/decorators/AnalyticsDecorator.tsx b/apps/nextjs/.storybook/decorators/AnalyticsDecorator.tsx
new file mode 100644
index 000000000..7ea156986
--- /dev/null
+++ b/apps/nextjs/.storybook/decorators/AnalyticsDecorator.tsx
@@ -0,0 +1,35 @@
+import React from "react";
+
+import type { Decorator } from "@storybook/react";
+import { fn } from "@storybook/test";
+
+import {
+  analyticsContext,
+  type AnalyticsContext,
+} from "../../src/components/ContextProviders/AnalyticsProvider";
+
+declare module "@storybook/csf" {
+  interface Parameters {
+    analyticsContext?: Partial<AnalyticsContext>;
+  }
+}
+
+export const AnalyticsDecorator: Decorator = (Story, { parameters }) => {
+  return (
+    <analyticsContext.Provider
+      value={
+        {
+          track: fn(),
+          trackEvent: fn(),
+          identify: fn(),
+          reset: fn(),
+          page: fn(),
+          posthogAiBetaClient: {},
+          ...parameters.analyticsContext,
+        } as unknown as AnalyticsContext
+      }
+    >
+      <Story />
+    </analyticsContext.Provider>
+  );
+};
diff --git a/apps/nextjs/.storybook/decorators/ChatDecorator.tsx b/apps/nextjs/.storybook/decorators/ChatDecorator.tsx
new file mode 100644
index 000000000..38caa8d10
--- /dev/null
+++ b/apps/nextjs/.storybook/decorators/ChatDecorator.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+
+import type { Decorator } from "@storybook/react";
+
+import {
+  ChatContext,
+  type ChatContextProps,
+} from "../../src/components/ContextProviders/ChatProvider";
+
+declare module "@storybook/csf" {
+  interface Parameters {
+    chatContext?: Partial<ChatContextProps>;
+  }
+}
+
+export const ChatDecorator: Decorator = (Story, { parameters }) => (
+  <ChatContext.Provider value={parameters.chatContext as ChatContextProps}>
+    <Story />
+  </ChatContext.Provider>
+);
diff --git a/apps/nextjs/.storybook/decorators/DemoDecorator.tsx b/apps/nextjs/.storybook/decorators/DemoDecorator.tsx
new file mode 100644
index 000000000..111525528
--- /dev/null
+++ b/apps/nextjs/.storybook/decorators/DemoDecorator.tsx
@@ -0,0 +1,62 @@
+import React from "react";
+
+import type { Decorator } from "@storybook/react";
+import invariant from "tiny-invariant";
+
+import {
+  DemoContext,
+  type DemoContextProps,
+} from "@/components/ContextProviders/Demo";
+
+declare module "@storybook/csf" {
+  interface Parameters {
+    demoContext?: DemoContextProps;
+  }
+}
+
+export const DemoDecorator: Decorator = (Story, { parameters }) => {
+  const value = parameters.demoContext;
+  invariant(
+    value,
+    "DemoDecorator requires a DemoContext. Please call ...demoParams() in the parameters",
+  );
+
+  return (
+    <DemoContext.Provider value={value}>
+      <Story />
+    </DemoContext.Provider>
+  );
+};
+
+const demoBase: DemoContextProps["demo"] = {
+  appSessionsRemaining: 2,
+  appSessionsPerMonth: 3,
+  contactHref: "https://share.hsforms.com/1R9ulYSNPQgqElEHde3KdhAbvumd",
+};
+
+type DemoParams = {
+  isDemoUser: boolean;
+  demo?: Partial<DemoContextProps["demo"]>;
+  isSharingEnabled?: boolean;
+};
+export const demoParams = (
+  args: DemoParams,
+): { demoContext: DemoContextProps } => {
+  const isSharingEnabled = args.isSharingEnabled ?? true;
+
+  const context: DemoContextProps = args.isDemoUser
+    ? {
+        isDemoUser: true,
+        demo: { ...demoBase, ...args.demo },
+        isSharingEnabled,
+      }
+    : {
+        isDemoUser: false,
+        demo: undefined,
+        isSharingEnabled,
+      };
+
+  return {
+    demoContext: context,
+  };
+};
diff --git a/apps/nextjs/.storybook/decorators/DialogContentDecorator.tsx b/apps/nextjs/.storybook/decorators/DialogContentDecorator.tsx
new file mode 100644
index 000000000..052d7598b
--- /dev/null
+++ b/apps/nextjs/.storybook/decorators/DialogContentDecorator.tsx
@@ -0,0 +1,30 @@
+import React from "react";
+
+import type { Decorator } from "@storybook/react";
+import { fn } from "@storybook/test";
+
+import type { DialogTypes } from "../../src/components/AppComponents/Chat/Chat/types";
+import { DialogContext } from "../../src/components/AppComponents/DialogContext";
+
+declare module "@storybook/csf" {
+  interface Parameters {
+    dialogWindow?: DialogTypes;
+  }
+}
+
+export const DialogContentDecorator: Decorator = (Story, { parameters }) => {
+  return (
+    <DialogContext.Provider
+      value={{
+        dialogWindow: parameters.dialogWindow ?? "",
+        setDialogWindow: fn(),
+        dialogProps: {},
+        setDialogProps: fn(),
+        openSidebar: false,
+        setOpenSidebar: fn(),
+      }}
+    >
+      <Story />
+    </DialogContext.Provider>
+  );
+};
diff --git a/apps/nextjs/.storybook/decorators/LessonPlanTrackingDecorator.tsx b/apps/nextjs/.storybook/decorators/LessonPlanTrackingDecorator.tsx
new file mode 100644
index 000000000..96b6b46dc
--- /dev/null
+++ b/apps/nextjs/.storybook/decorators/LessonPlanTrackingDecorator.tsx
@@ -0,0 +1,21 @@
+import React from "react";
+
+import type { Decorator } from "@storybook/react";
+import { fn } from "@storybook/test";
+
+import { LessonPlanTrackingContext } from "../../src/lib/analytics/lessonPlanTrackingContext";
+
+export const LessonPlanTrackingDecorator: Decorator = (Story) => (
+  <LessonPlanTrackingContext.Provider
+    value={{
+      onClickContinue: fn(),
+      onClickRetry: fn(),
+      onClickStartFromExample: fn(),
+      onClickStartFromFreeText: fn(),
+      onStreamFinished: fn(),
+      onSubmitText: fn(),
+    }}
+  >
+    <Story />
+  </LessonPlanTrackingContext.Provider>
+);
diff --git a/apps/nextjs/.storybook/decorators/RadixThemeDecorator.tsx b/apps/nextjs/.storybook/decorators/RadixThemeDecorator.tsx
index 590c5bf62..457a5a501 100644
--- a/apps/nextjs/.storybook/decorators/RadixThemeDecorator.tsx
+++ b/apps/nextjs/.storybook/decorators/RadixThemeDecorator.tsx
@@ -1,8 +1,9 @@
 import React from "react";
 
 import { Theme } from "@radix-ui/themes";
+import { Decorator } from "@storybook/react";
 
-export const RadixThemeDecorator = (Story: React.ComponentType) => (
+export const RadixThemeDecorator: Decorator = (Story) => (
   <Theme>
     <Story />
   </Theme>
diff --git a/apps/nextjs/.storybook/decorators/SidebarDecorator.tsx b/apps/nextjs/.storybook/decorators/SidebarDecorator.tsx
new file mode 100644
index 000000000..6d3f44644
--- /dev/null
+++ b/apps/nextjs/.storybook/decorators/SidebarDecorator.tsx
@@ -0,0 +1,25 @@
+import React from "react";
+
+import type { Decorator } from "@storybook/react";
+import { fn } from "@storybook/test";
+
+import { SidebarContext } from "../../src/lib/hooks/use-sidebar";
+
+declare module "@storybook/csf" {
+  interface Parameters {
+    // Please fill out as we add configuration
+    sidebarContext?: {};
+  }
+}
+
+export const SidebarDecorator: Decorator = (Story) => (
+  <SidebarContext.Provider
+    value={{
+      toggleSidebar: fn(),
+      isLoading: false,
+      isSidebarOpen: false,
+    }}
+  >
+    <Story />
+  </SidebarContext.Provider>
+);
diff --git a/apps/nextjs/.storybook/preview.tsx b/apps/nextjs/.storybook/preview.tsx
index 428690b9c..0f552f1be 100644
--- a/apps/nextjs/.storybook/preview.tsx
+++ b/apps/nextjs/.storybook/preview.tsx
@@ -8,16 +8,27 @@ 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 { initialize as initializeMsw, mswLoader } from "msw-storybook-addon";
+import {
+  initialize as initializeMsw,
+  mswLoader,
+  MswParameters,
+} from "msw-storybook-addon";
 
 import { TooltipProvider } from "../src/components/AppComponents/Chat/ui/tooltip";
 import { DialogProvider } from "../src/components/AppComponents/DialogContext";
 import { AnalyticsProvider } from "../src/mocks/analytics/provider";
 import { ClerkDecorator } from "../src/mocks/clerk/ClerkDecorator";
 import { TRPCReactProvider } from "../src/utils/trpc";
+import { chromaticParams } from "./chromatic";
 import { RadixThemeDecorator } from "./decorators/RadixThemeDecorator";
 import "./preview.css";
 
+declare module "@storybook/csf" {
+  interface Parameters {
+    msw?: MswParameters["msw"];
+  }
+}
+
 initializeMsw();
 
 const preview: Preview = {
@@ -28,24 +39,38 @@ const preview: Preview = {
         date: /Date$/i,
       },
     },
+    viewport: {
+      viewports: {
+        mobile: {
+          name: "Mobile",
+          styles: { width: "375px", height: "800px" },
+        },
+        mobileWide: {
+          name: "Mobile Wide",
+          styles: { width: "430px", height: "930px" },
+        },
+        desktop: {
+          name: "Desktop",
+          styles: { width: "1200px", height: "1000px" },
+        },
+        desktopWide: {
+          name: "Desktop Wide",
+          styles: { width: "1400px", height: "1000px" },
+        },
+      },
+    },
+    ...chromaticParams(["desktop"]),
   },
   loaders: [mswLoader],
 };
 
-// Providers not currently used
-// - CookieConsentProvider
-// - DemoProvider
-// - LessonPlanTrackingProvider
-// - DialogProvider
-// - SidebarProvider
-// - ChatModerationProvider
+// NOTE: See ./decorators for more decorators available to use in stories
 
 export const decorators: Decorator[] = [
   RadixThemeDecorator,
   ClerkDecorator,
   (Story) => (
     <>
-      {/* TODO: Mock tRPC calls with MSW */}
       <TRPCReactProvider>
         <AnalyticsProvider>
           <DialogProvider>
diff --git a/apps/nextjs/.storybook/public/.eslintignore b/apps/nextjs/.storybook/public/.eslintignore
new file mode 100644
index 000000000..9718b3bbc
--- /dev/null
+++ b/apps/nextjs/.storybook/public/.eslintignore
@@ -0,0 +1 @@
+apps/nextjs/.storybook/public/mockServiceWorker.js
\ No newline at end of file
diff --git a/apps/nextjs/__mocks__/nextImageMock.js b/apps/nextjs/__mocks__/nextImageMock.js
index d3ad25552..934118671 100644
--- a/apps/nextjs/__mocks__/nextImageMock.js
+++ b/apps/nextjs/__mocks__/nextImageMock.js
@@ -1,7 +1,14 @@
 import React from "react";
 
+import PropTypes from "prop-types";
+
 const NextImageMock = ({ src, alt, ...props }) => {
   return <img src={src || ""} alt={alt} {...props} />;
 };
 
+NextImageMock.propTypes = {
+  src: PropTypes.string.isRequired,
+  alt: PropTypes.string.isRequired,
+};
+
 export default NextImageMock;
diff --git a/apps/nextjs/jest.config.js b/apps/nextjs/jest.config.mjs
similarity index 55%
rename from apps/nextjs/jest.config.js
rename to apps/nextjs/jest.config.mjs
index 223d2471c..7898f8abb 100644
--- a/apps/nextjs/jest.config.js
+++ b/apps/nextjs/jest.config.mjs
@@ -1,5 +1,9 @@
-const { pathsToModuleNameMapper } = require("ts-jest");
-const { compilerOptions } = require("./tsconfig.test.json");
+import { readFile } from "fs/promises";
+import { pathsToModuleNameMapper } from "ts-jest";
+
+const tsconfig = JSON.parse(
+  await readFile(new URL("./tsconfig.test.json", import.meta.url)),
+);
 
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 const config = {
@@ -9,14 +13,15 @@ const config = {
       {
         tsconfig: "tsconfig.test.json",
         useESM: true,
+        isolatedModules: true,
       },
     ],
-    "^.+\\.svg$": "<rootDir>/jest.svgTransform.js",
+    "^.+\\.svg$": "<rootDir>/jest.svgTransform.mjs",
     "^.+\\.(css|scss|png|jpg|jpeg|gif|webp|avif)$": "jest-transform-stub",
   },
   preset: "ts-jest/presets/default-esm",
   moduleNameMapper: {
-    ...pathsToModuleNameMapper(compilerOptions.paths, {
+    ...pathsToModuleNameMapper(tsconfig.compilerOptions.paths, {
       prefix: "<rootDir>/src/",
     }),
     "^(\\.{1,2}/.*)\\.js$": "$1",
@@ -29,7 +34,12 @@ const config = {
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   rootDir: ".",
   resetMocks: true,
-  setupFilesAfterEnv: ["<rootDir>/jest.setup.js"],
+  setupFilesAfterEnv: ["<rootDir>/jest.setup.cjs"],
+  collectCoverageFrom: ["src/**/*.{ts,tsx,js,jsx}"],
+  collectCoverage:
+    process.env.CI === "true" || process.env.COLLECT_TEST_COVERAGE === "true",
+  coverageReporters: ["lcov", "text"],
+  coverageDirectory: "coverage",
 };
 
-module.exports = config;
+export default config;
diff --git a/apps/nextjs/jest.setup.js b/apps/nextjs/jest.setup.cjs
similarity index 100%
rename from apps/nextjs/jest.setup.js
rename to apps/nextjs/jest.setup.cjs
diff --git a/apps/nextjs/jest.static.d.ts b/apps/nextjs/jest.static.d.ts
index 95daa5e7f..ded555fbb 100644
--- a/apps/nextjs/jest.static.d.ts
+++ b/apps/nextjs/jest.static.d.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 declare module "*.svg" {
   const content: any;
   export default content;
diff --git a/apps/nextjs/jest.svgTransform.js b/apps/nextjs/jest.svgTransform.mjs
similarity index 89%
rename from apps/nextjs/jest.svgTransform.js
rename to apps/nextjs/jest.svgTransform.mjs
index 16506e1c5..685e8670c 100644
--- a/apps/nextjs/jest.svgTransform.js
+++ b/apps/nextjs/jest.svgTransform.mjs
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   process() {
     console.log("Called jest svg transform");
     return { code: "module.exports = {};" };
diff --git a/apps/nextjs/next.config.js b/apps/nextjs/next.config.js
index 6f9dad15f..0dd375c38 100644
--- a/apps/nextjs/next.config.js
+++ b/apps/nextjs/next.config.js
@@ -1,9 +1,10 @@
+// This file should be in Common JS format to be compatible with Next.js
 const {
   getAppVersion,
   getReleaseStage,
   RELEASE_STAGE_PRODUCTION,
   RELEASE_STAGE_TESTING,
-} = require("./scripts/build_config_helpers.js");
+} = require("./scripts/build_config_helpers.cjs");
 const path = require("path");
 
 const { PHASE_PRODUCTION_BUILD, PHASE_TEST } = require("next/constants");
diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json
index 89f06f7e8..a6a7f072f 100644
--- a/apps/nextjs/package.json
+++ b/apps/nextjs/package.json
@@ -1,25 +1,27 @@
 {
   "name": "@oakai/nextjs",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "build": "next build",
     "build:dev": "pnpm with-env next build",
     "check": "tsc --noEmit",
     "clean": "rm -rf .next .turbo node_modules",
-    "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": "FORCE_COLOR=1 SENTRY_SUPPRESS_TURBOPACK_WARNING=1 pnpm with-env next dev --port 2525 --turbo | pino-pretty -C",
+    "dev:sentry": "FORCE_COLOR=1 pnpm with-env 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": "eslint .",
     "lint-fix": "next lint --fix",
+    "lint-debug": "eslint --debug .",
     "start": "next start",
     "type-check": "tsc --noEmit",
-    "test": "pnpm with-env jest --colors --config jest.config.js",
-    "test:seq": "pnpm with-env jest --colors --config jest.config.js --verbose --runInBand --no-cache",
+    "test": "pnpm with-env jest --colors --config jest.config.mjs",
+    "test:seq": "pnpm with-env jest --colors --config jest.config.mjs --verbose --runInBand --no-cache",
     "test-e2e": "pnpm with-env playwright test",
     "test-e2e-ui": "pnpm with-env playwright test --ui",
     "test-e2e-ui-serve": "pnpm build && pnpm start --port 4848 --turbo",
     "test-e2e-ui-built": "PORT=4848 pnpm with-env playwright test --ui",
+    "test-coverage": "COLLECT_TEST_COVERAGE=true pnpm with-env jest --colors --config jest.config.mjs --coverage",
     "with-env": "dotenv -e ../../.env --",
     "aila": "tsx scripts/aila-cli.ts",
     "storybook": "dotenv -e ../../.env -- storybook dev -p 6006 --no-open",
@@ -42,14 +44,15 @@
     "@oakai/api": "*",
     "@oakai/core": "*",
     "@oakai/db": "*",
+    "@oakai/eslint-config": "*",
     "@oakai/exports": "*",
     "@oakai/logger": "*",
     "@oakai/prettier-config": "*",
     "@oaknational/oak-components": "^1.50.0",
     "@oaknational/oak-consent-client": "^2.1.0",
     "@portabletext/react": "^3.1.0",
-    "@prisma/client": "5.16.1",
-    "@prisma/extension-accelerate": "^1.0.0",
+    "@prisma/client": "^5.16.1",
+    "@prisma/extension-accelerate": "^1.2.1",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-tooltip": "^1.0.7",
@@ -93,8 +96,8 @@
     "openai": "^4.58.1",
     "p-limit": "^6.1.0",
     "partial-json-parser": "^1.2.2",
-    "posthog-js": "^1.139.1",
-    "posthog-node": "^4.0.0",
+    "posthog-js": "^1.201.0",
+    "posthog-node": "^4.3.2",
     "pptxgenjs": "^3.12.0",
     "ramda": "^0.30.1",
     "react": "18.2.0",
@@ -140,8 +143,8 @@
     "@storybook/test": "^8.4.1",
     "@tailwindcss/typography": "^0.5.10",
     "@types/file-saver": "^2.0.6",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^18.17.0",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20.9.0",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
     "@types/styled-components": "^5.1.34",
@@ -149,17 +152,14 @@
     "avo": "^3.2.11",
     "concurrently": "^8.2.2",
     "dotenv-cli": "^6.0.0",
-    "eslint": "^8.56.0",
-    "eslint-config-next": "15.0.1",
-    "eslint-plugin-storybook": "^0.8.0",
     "graphql": "^16.9.0",
     "jest": "^29.7.0",
     "msw": "^2.6.5",
     "msw-storybook-addon": "^2.0.4",
     "postcss": "^8.4.32",
     "tailwindcss": "^3.3.7",
-    "ts-jest": "^29.1.4",
-    "typescript": "5.3.3",
+    "ts-jest": "^29.2.5",
+    "typescript": "5.7.2",
     "web-streams-polyfill": "^4.0.0"
   },
   "engines": {
@@ -170,5 +170,12 @@
     "workerDirectory": [
       ".storybook/public"
     ]
+  },
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "rules": {}
   }
 }
diff --git a/apps/nextjs/scripts/build_config_helpers.js b/apps/nextjs/scripts/build_config_helpers.cjs
similarity index 99%
rename from apps/nextjs/scripts/build_config_helpers.js
rename to apps/nextjs/scripts/build_config_helpers.cjs
index 4016a0c86..ca4a2b30f 100644
--- a/apps/nextjs/scripts/build_config_helpers.js
+++ b/apps/nextjs/scripts/build_config_helpers.cjs
@@ -7,7 +7,7 @@ const { existsSync, readFileSync } = require("fs");
  * @returns {(string|null)} The SHA if found, or "no_git_state" if mid-merge, or `null` if it cannot be determined.
  */
 function getLocalGitRef() {
-  if (existsSync("../../.git")) {
+  if (existsSync("../../.git/HEAD")) {
     const rev = readFileSync("../../.git/HEAD")
       .toString()
       .trim()
diff --git a/apps/nextjs/scripts/increase-listeners.js b/apps/nextjs/scripts/increase-listeners.js
deleted file mode 100644
index 7d9e0c25a..000000000
--- a/apps/nextjs/scripts/increase-listeners.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**** 
-   Because we have a reasonably complex Next.js project now,
-   we're sometimes running into the default max listeners limit.
-   This script increases the limit to 20, which should be enough
-   so that we don't run into this issue. 
-   
-   Potentially, if we decide to move to Turbopack for compilation
-   in local development, we could remove this script. 
-   
-***/
-
-// Increase the limit of max listeners
-require("events").EventEmitter.defaultMaxListeners = 20;
-
-// Run the original command
-require("child_process").spawn(process.argv[2], process.argv.slice(3), {
-  stdio: "inherit",
-});
diff --git a/apps/nextjs/scripts/preload-chat-routes.mjs b/apps/nextjs/scripts/preload-chat-routes.mjs
index fee10aa64..de599b985 100644
--- a/apps/nextjs/scripts/preload-chat-routes.mjs
+++ b/apps/nextjs/scripts/preload-chat-routes.mjs
@@ -36,8 +36,13 @@ const preBuildRoutes = async (
           .get(`http://localhost:2525${route}`, { headers })
           .then(() => console.log(`Pre-built route: ${route}`))
           .catch((error) => {
-            console.log(`Error pre-building route: ${route}`, error.message);
-            return Promise.reject(error);
+            const errorToLog =
+              error instanceof Error ? error : new Error(String(error));
+            console.log(
+              `Error pre-building route: ${route}`,
+              errorToLog.message,
+            );
+            return Promise.reject(errorToLog);
           });
       } else {
         return axios({
@@ -51,12 +56,14 @@ const preBuildRoutes = async (
             ),
           )
           .catch((error) => {
-            console.log(error);
+            const errorToLog =
+              error instanceof Error ? error : new Error(String(error));
+            console.log(errorToLog);
             console.log(
               `Error pre-building route: ${route.url}`,
-              error.message,
+              errorToLog.message,
             );
-            return Promise.reject(error);
+            return Promise.reject(errorToLog);
           });
       }
     });
@@ -68,6 +75,7 @@ const preBuildRoutes = async (
     console.log("All routes pre-built successfully");
     console.timeEnd(timerId);
   } catch (error) {
+    console.error(error);
     if (retryCount < maxRetries) {
       console.log(
         `Retrying pre-build (attempt ${retryCount + 1} of ${maxRetries})...`,
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts b/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
index 5efddcb15..0918104d8 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
@@ -1,11 +1,14 @@
 import type { GenerationPart } from "@oakai/core/src/types";
+import { aiLogger } from "@oakai/logger";
 
 import { getAgesFromKeyStage } from "@/utils/getAgesFromKeyStage";
 
 import { extraQuizPromptInfo } from "./extraQuizPromptInfo";
 import type { QuizAppState, QuizAppStateQuestion } from "./state/types";
 
-type RequestionGenerationInputs = {
+const logger = aiLogger("quiz");
+
+export type RequestionGenerationInputs = {
   lastGenerationId: string | null;
   sessionId: string;
   factQuestion: string;
@@ -26,14 +29,16 @@ type RequestionGenerationInputs = {
   };
 };
 
-type QuizRequestGenerationProps = {
+export type QuizRequestGenerationProps = {
   state: QuizAppState;
   questionRow: QuizAppStateQuestion;
   lastGeneration: GenerationPart<string> | undefined;
-  requestGeneration: (requestionGenInputs: RequestionGenerationInputs) => void;
+  requestGeneration: (
+    requestionGenInputs: RequestionGenerationInputs,
+  ) => Promise<void>;
 };
 
-export function quizRequestGeneration({
+export async function quizRequestGeneration({
   state,
   questionRow,
   requestGeneration,
@@ -47,7 +52,7 @@ export function quizRequestGeneration({
     state,
     questionRow,
   });
-  requestGeneration({
+  await requestGeneration({
     lastGenerationId: lastGeneration?.lastGenerationId ?? null,
     sessionId,
     factQuestion: `${topic}: ${questionRow.question.value}`,
@@ -68,5 +73,7 @@ export function quizRequestGeneration({
         (distractor) => distractor.value,
       ),
     },
+  }).catch((e) => {
+    logger.error(e);
   });
 }
diff --git a/apps/nextjs/src/app/actions.ts b/apps/nextjs/src/app/actions.ts
index 7cc3bb9b5..b365ff4bc 100644
--- a/apps/nextjs/src/app/actions.ts
+++ b/apps/nextjs/src/app/actions.ts
@@ -43,7 +43,7 @@ export async function getChatById(
   id: string,
 ): Promise<AilaPersistedChat | null> {
   const session = await prisma?.appSession.findUnique({
-    where: { id },
+    where: { id, deletedAt: null },
   });
 
   if (!session) {
@@ -55,7 +55,7 @@ export async function getChatById(
       id,
       sessionOutput: session.output,
       userId: session.userId,
-    }) || null
+    }) ?? null
   );
 }
 
diff --git a/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx b/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
index 8b7174c78..5a2c43b14 100644
--- a/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
+++ b/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
@@ -7,7 +7,11 @@ import { OakAccordion, OakPrimaryButton } from "@oaknational/oak-components";
 
 import { trpc } from "@/utils/trpc";
 
-function ModerationListItem({ moderation }: { readonly moderation: Moderation }) {
+function ModerationListItem({
+  moderation,
+}: {
+  readonly moderation: Moderation;
+}) {
   const { id, invalidatedAt } = moderation;
   const [invalidated, setInvalidated] = useState(Boolean(invalidatedAt));
   const invalidateModeration = trpc.admin.invalidateModeration.useMutation({
@@ -28,7 +32,7 @@ function ModerationListItem({ moderation }: { readonly moderation: Moderation })
               iconName="cross"
               className="ml-auto"
               onClick={() =>
-                invalidateModeration.mutateAsync({ moderationId: id })
+                void invalidateModeration.mutateAsync({ moderationId: id })
               }
               isLoading={invalidateModeration.isLoading}
               disabled={!!invalidated}
@@ -41,14 +45,16 @@ function ModerationListItem({ moderation }: { readonly moderation: Moderation })
             {moderation.justification}
           </blockquote>
           <div className="mt-2 space-x-2">
-            {moderation.categories.map((category, index) => (
-              <span
-                key={index}
-                className="inline-block rounded-md bg-zinc-300 px-8 py-4 text-xs font-semibold text-zinc-800"
-              >
-                {String(category)}
-              </span>
-            ))}
+            {Array.from(new Set(moderation.categories))
+              .map((c) => String(c))
+              .map((category) => (
+                <span
+                  key={category}
+                  className="inline-block rounded-md bg-zinc-300 px-8 py-4 text-xs font-semibold text-zinc-800"
+                >
+                  {category}
+                </span>
+              ))}
           </div>
         </div>
       </div>
diff --git a/apps/nextjs/src/app/aila/[id]/download/DownloadView.stories.tsx b/apps/nextjs/src/app/aila/[id]/download/DownloadView.stories.tsx
index 6021b1dfe..f61acc667 100644
--- a/apps/nextjs/src/app/aila/[id]/download/DownloadView.stories.tsx
+++ b/apps/nextjs/src/app/aila/[id]/download/DownloadView.stories.tsx
@@ -1,14 +1,17 @@
 import type { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
 import type { Meta, StoryObj } from "@storybook/react";
 
+import { chromaticParams } from "@/storybook/chromatic";
+
 import { DemoProvider } from "../../../../../src/components/ContextProviders/Demo";
 import { DownloadContent } from "./DownloadView";
 
-const meta: Meta<typeof DownloadContent> = {
+const meta = {
   title: "Pages/Chat/Download",
   component: DownloadContent,
   parameters: {
     layout: "fullscreen",
+    ...chromaticParams(["mobile", "desktop"]),
   },
   decorators: [
     (Story) => (
@@ -17,10 +20,10 @@ const meta: Meta<typeof DownloadContent> = {
       </DemoProvider>
     ),
   ],
-};
+} satisfies Meta<typeof DownloadContent>;
 
 export default meta;
-type Story = StoryObj<typeof DownloadContent>;
+type Story = StoryObj<typeof meta>;
 
 const chat: AilaPersistedChat = {
   id: "nSLmbQ1LO75zLTcA",
diff --git a/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx b/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx
index 165e3a41b..5735bdc87 100644
--- a/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx
+++ b/apps/nextjs/src/app/aila/[id]/download/DownloadView.tsx
@@ -37,164 +37,162 @@ export function DownloadContent({ chat }: Readonly<DownloadViewProps>) {
   const isLessonComplete = totalSectionsComplete >= totalSections;
 
   return (
-    <>
-      <DialogRoot>
-        <DialogContents
-          chatId={chat.id}
-          lesson={lessonPlan}
-          isShared={chat.isShared}
-        />
-        <SurveyDialogLauncher />
-        <div className="mx-auto mb-26 mt-30 w-full max-w-[1280px] px-9">
-          <Box width="100%">
-            <Box className="w-full">
-              <Button
-                variant="text-link"
-                href={`/aila/${chat.id}`}
-                icon="chevron-left"
-                iconPosition="leading"
-                size="sm"
-              >
-                <span className="text-base font-light underline">
-                  Back to lesson
-                </span>
-              </Button>
+    <DialogRoot>
+      <DialogContents
+        chatId={chat.id}
+        lesson={lessonPlan}
+        isShared={chat.isShared}
+      />
+      <SurveyDialogLauncher />
+      <div className="mx-auto mb-26 mt-30 w-full max-w-[1280px] px-9">
+        <Box width="100%">
+          <Box className="w-full">
+            <Button
+              variant="text-link"
+              href={`/aila/${chat.id}`}
+              icon="chevron-left"
+              iconPosition="leading"
+              size="sm"
+            >
+              <span className="text-base font-light underline">
+                Back to lesson
+              </span>
+            </Button>
 
-              <div>
-                <h1 className="my-24 text-4xl font-bold">Download resources</h1>
-                <p className="mb-24 max-w-[600px]">
-                  {isLessonComplete ? (
-                    <SectionsCompleteDownloadNotice />
-                  ) : (
-                    <SectionsNotCompleteDownloadNotice sections={sections} />
+            <div>
+              <h1 className="my-24 text-4xl font-bold">Download resources</h1>
+              <p className="mb-24 max-w-[600px]">
+                {isLessonComplete ? (
+                  <SectionsCompleteDownloadNotice />
+                ) : (
+                  <SectionsNotCompleteDownloadNotice sections={sections} />
+                )}
+              </p>
+            </div>
+            <Grid
+              columns={{
+                initial: "1",
+                sm: "2",
+              }}
+              className="gap-26"
+            >
+              <Flex direction="column" className="gap-14">
+                <DownloadAllButton
+                  onClick={() => exportAllAssets.start()}
+                  title="Download all resources"
+                  subTitle="Lesson plan, starter and exit quiz, slides and worksheet"
+                  downloadAvailable={!!exportAllAssets.readyToExport}
+                  downloadLoading={exportAllAssets.status === "loading"}
+                  data={exportAllAssets.data}
+                  data-testid="chat-download-all-resources"
+                  lesson={lessonPlan}
+                  chatId={id}
+                />
+                <DownloadButton
+                  chatId={id}
+                  onClick={() => lessonPlanExport.start()}
+                  title="Lesson plan"
+                  subTitle="Overview of the complete lesson"
+                  downloadAvailable={!!lessonPlanExport.readyToExport}
+                  downloadLoading={lessonPlanExport.status === "loading"}
+                  data={lessonPlanExport.data}
+                  exportsType="lessonPlanDoc"
+                  data-testid="chat-download-lesson-plan"
+                  lesson={lessonPlan}
+                />
+                <DownloadButton
+                  chatId={id}
+                  onClick={() => starterQuizExport.start()}
+                  title="Starter quiz"
+                  subTitle="Questions and answers to assess prior knowledge"
+                  downloadAvailable={!!starterQuizExport.readyToExport}
+                  downloadLoading={starterQuizExport.status === "loading"}
+                  data={starterQuizExport.data}
+                  exportsType="starterQuiz"
+                  lesson={lessonPlan}
+                />
+                <DownloadButton
+                  chatId={id}
+                  onClick={() => lessonSlidesExport.start()}
+                  data-testid="chat-download-slides-btn"
+                  title="Slide deck"
+                  subTitle="Learning outcome, keywords and learning cycles"
+                  downloadAvailable={lessonSlidesExport.readyToExport}
+                  downloadLoading={lessonSlidesExport.status === "loading"}
+                  data={lessonSlidesExport.data}
+                  exportsType="lessonSlides"
+                  lesson={lessonPlan}
+                />
+                <DownloadButton
+                  chatId={id}
+                  onClick={() => worksheetExport.start()}
+                  title="Worksheet"
+                  subTitle="Practice tasks"
+                  downloadAvailable={!!worksheetExport.readyToExport}
+                  downloadLoading={worksheetExport.status === "loading"}
+                  data={worksheetExport.data}
+                  lesson={lessonPlan}
+                  exportsType="worksheet"
+                />
+                <DownloadButton
+                  chatId={id}
+                  onClick={() => exitQuizExport.start()}
+                  title="Exit quiz"
+                  subTitle="Questions and answers to assess understanding"
+                  downloadAvailable={!!exitQuizExport.readyToExport}
+                  downloadLoading={exitQuizExport.status === "loading"}
+                  data={exitQuizExport.data}
+                  exportsType="exitQuiz"
+                  lesson={lessonPlan}
+                />
+                {lessonPlan.additionalMaterials &&
+                  lessonPlan.additionalMaterials !== "None" && (
+                    <DownloadButton
+                      chatId={id}
+                      onClick={() => additionalMaterialsExport.start()}
+                      title="Additional materials"
+                      subTitle="Document containing any additional materials"
+                      downloadAvailable={
+                        !!additionalMaterialsExport.readyToExport
+                      }
+                      downloadLoading={
+                        additionalMaterialsExport.status === "loading"
+                      }
+                      data={additionalMaterialsExport.data}
+                      exportsType="additionalMaterials"
+                      lesson={lessonPlan}
+                    />
                   )}
-                </p>
-              </div>
-              <Grid
-                columns={{
-                  initial: "1",
-                  sm: "2",
-                }}
-                className="gap-26"
-              >
-                <Flex direction="column" className="gap-14">
-                  <DownloadAllButton
-                    onClick={() => exportAllAssets.start()}
-                    title="Download all resources"
-                    subTitle="Lesson plan, starter and exit quiz, slides and worksheet"
-                    downloadAvailable={!!exportAllAssets.readyToExport}
-                    downloadLoading={exportAllAssets.status === "loading"}
-                    data={exportAllAssets.data}
-                    data-testid="chat-download-all-resources"
-                    lesson={lessonPlan}
-                    chatId={id}
-                  />
-                  <DownloadButton
-                    chatId={id}
-                    onClick={() => lessonPlanExport.start()}
-                    title="Lesson plan"
-                    subTitle="Overview of the complete lesson"
-                    downloadAvailable={!!lessonPlanExport.readyToExport}
-                    downloadLoading={lessonPlanExport.status === "loading"}
-                    data={lessonPlanExport.data}
-                    exportsType="lessonPlanDoc"
-                    data-testid="chat-download-lesson-plan"
-                    lesson={lessonPlan}
-                  />
-                  <DownloadButton
-                    chatId={id}
-                    onClick={() => starterQuizExport.start()}
-                    title="Starter quiz"
-                    subTitle="Questions and answers to assess prior knowledge"
-                    downloadAvailable={!!starterQuizExport.readyToExport}
-                    downloadLoading={starterQuizExport.status === "loading"}
-                    data={starterQuizExport.data}
-                    exportsType="starterQuiz"
-                    lesson={lessonPlan}
-                  />
-                  <DownloadButton
-                    chatId={id}
-                    onClick={() => lessonSlidesExport.start()}
-                    data-testid="chat-download-slides-btn"
-                    title="Slide deck"
-                    subTitle="Learning outcome, keywords and learning cycles"
-                    downloadAvailable={lessonSlidesExport.readyToExport}
-                    downloadLoading={lessonSlidesExport.status === "loading"}
-                    data={lessonSlidesExport.data}
-                    exportsType="lessonSlides"
-                    lesson={lessonPlan}
-                  />
-                  <DownloadButton
-                    chatId={id}
-                    onClick={() => worksheetExport.start()}
-                    title="Worksheet"
-                    subTitle="Practice tasks"
-                    downloadAvailable={!!worksheetExport.readyToExport}
-                    downloadLoading={worksheetExport.status === "loading"}
-                    data={worksheetExport.data}
-                    lesson={lessonPlan}
-                    exportsType="worksheet"
-                  />
-                  <DownloadButton
-                    chatId={id}
-                    onClick={() => exitQuizExport.start()}
-                    title="Exit quiz"
-                    subTitle="Questions and answers to assess understanding"
-                    downloadAvailable={!!exitQuizExport.readyToExport}
-                    downloadLoading={exitQuizExport.status === "loading"}
-                    data={exitQuizExport.data}
-                    exportsType="exitQuiz"
-                    lesson={lessonPlan}
-                  />
-                  {lessonPlan.additionalMaterials &&
-                    lessonPlan.additionalMaterials !== "None" && (
-                      <DownloadButton
-                        chatId={id}
-                        onClick={() => additionalMaterialsExport.start()}
-                        title="Additional materials"
-                        subTitle="Document containing any additional materials"
-                        downloadAvailable={
-                          !!additionalMaterialsExport.readyToExport
-                        }
-                        downloadLoading={
-                          additionalMaterialsExport.status === "loading"
-                        }
-                        data={additionalMaterialsExport.data}
-                        exportsType="additionalMaterials"
-                        lesson={lessonPlan}
-                      />
-                    )}
-                </Flex>
-                <Box>
-                  <div className="mb-17">
-                    <span className=" font-bold">
-                      {`${totalSectionsComplete} of ${totalSections} sections complete`}
-                    </span>
-                  </div>
-                  {sections.map((section) => {
-                    return (
+              </Flex>
+              <Box>
+                <div className="mb-17">
+                  <span className=" font-bold">
+                    {`${totalSectionsComplete} of ${totalSections} sections complete`}
+                  </span>
+                </div>
+                {sections.map((section) => {
+                  return (
+                    <span
+                      key={`progress-sections-${section.label}`}
+                      className="mb-7 flex gap-6 py-5"
+                    >
                       <span
-                        key={`progress-sections-${section.label}`}
-                        className="mb-7 flex gap-6 py-5"
+                        className={`flex w-14 items-center justify-center ${
+                          section.complete ? "opacity-100" : "opacity-30"
+                        }`}
                       >
-                        <span
-                          className={`flex w-14 items-center justify-center ${
-                            section.complete ? "opacity-100" : "opacity-30"
-                          }`}
-                        >
-                          <Icon icon="tick" className="mr-2" size="sm" />
-                        </span>
-                        <p>{section.label}</p>
+                        <Icon icon="tick" className="mr-2" size="sm" />
                       </span>
-                    );
-                  })}
-                </Box>
-              </Grid>
-            </Box>
+                      <p>{section.label}</p>
+                    </span>
+                  );
+                })}
+              </Box>
+            </Grid>
           </Box>
-        </div>
-      </DialogRoot>
-    </>
+        </Box>
+      </div>
+    </DialogRoot>
   );
 }
 
diff --git a/apps/nextjs/src/app/aila/[id]/share/index.stories.tsx b/apps/nextjs/src/app/aila/[id]/share/index.stories.tsx
index b8a803caf..4c4ba5945 100644
--- a/apps/nextjs/src/app/aila/[id]/share/index.stories.tsx
+++ b/apps/nextjs/src/app/aila/[id]/share/index.stories.tsx
@@ -1,18 +1,21 @@
 import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import type { Meta, StoryObj } from "@storybook/react";
 
+import { chromaticParams } from "@/storybook/chromatic";
+
 import ShareChat from "./";
 
-const meta: Meta<typeof ShareChat> = {
+const meta = {
   title: "Pages/Chat/Share",
   component: ShareChat,
   parameters: {
     layout: "fullscreen",
+    ...chromaticParams(["mobile", "desktop"]),
   },
-};
+} satisfies Meta<typeof ShareChat>;
 
 export default meta;
-type Story = StoryObj<typeof ShareChat>;
+type Story = StoryObj<typeof meta>;
 
 const lessonPlan: LooseLessonPlan = {
   title: "The End of Roman Britain",
diff --git a/apps/nextjs/src/app/aila/help/index.stories.tsx b/apps/nextjs/src/app/aila/help/index.stories.tsx
index df567c777..20695aa7b 100644
--- a/apps/nextjs/src/app/aila/help/index.stories.tsx
+++ b/apps/nextjs/src/app/aila/help/index.stories.tsx
@@ -1,15 +1,17 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
 import { DemoProvider } from "@/components/ContextProviders/Demo";
+import { chromaticParams } from "@/storybook/chromatic";
 
 import { HelpContent } from ".";
 
-const meta: Meta<typeof HelpContent> = {
+const meta = {
   title: "Pages/Chat/Help",
   component: HelpContent,
   parameters: {
     // Including custom decorators changes the layout from fullscreen
     layout: "fullscreen",
+    ...chromaticParams(["mobile", "desktop"]),
   },
   decorators: [
     (Story) => (
@@ -18,10 +20,10 @@ const meta: Meta<typeof HelpContent> = {
       </DemoProvider>
     ),
   ],
-};
+} satisfies Meta<typeof HelpContent>;
 
 export default meta;
-type Story = StoryObj<typeof HelpContent>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
diff --git a/apps/nextjs/src/app/aila/help/index.tsx b/apps/nextjs/src/app/aila/help/index.tsx
index 3646ae0a9..355ae6257 100644
--- a/apps/nextjs/src/app/aila/help/index.tsx
+++ b/apps/nextjs/src/app/aila/help/index.tsx
@@ -1,27 +1,40 @@
 "use client";
 
-import { useRef } from "react";
+import { useRef, type MutableRefObject } from "react";
 
-import { OakLink } from "@oaknational/oak-components";
+import {
+  OakBox,
+  OakFlex,
+  OakGrid,
+  OakGridArea,
+  OakHeading,
+  OakLI,
+  OakLink,
+  OakMaxWidth,
+  OakP,
+  OakUL,
+} from "@oaknational/oak-components";
 import { useSearchParams } from "next/navigation";
 
-import { Header } from "@/components/AppComponents/Chat/header";
 import GetInTouchBox from "@/components/AppComponents/GetInTouchBox";
+import Layout from "@/components/Layout";
 
 export const HelpContent = () => {
   const startingRef = useRef(null);
   const structureRef = useRef(null);
+  const learningCycles = useRef(null);
   const downloadsRef = useRef(null);
+  const additionalMaterialsRef = useRef(null);
   const creatingRef = useRef(null);
   const reviewingRef = useRef(null);
   const downloadingRef = useRef(null);
   const aiRef = useRef(null);
 
-  const scrollToRefWithOffset = (ref) => {
-    if (ref && ref.current) {
+  const scrollToRefWithOffset = (ref: MutableRefObject<HTMLElement | null>) => {
+    if (ref?.current) {
       const yOffset = -72; // Adjust this value as needed
       const y =
-        ref.current.getBoundingClientRect().top + window.pageYOffset + yOffset;
+        ref.current.getBoundingClientRect().top + window.scrollY + yOffset;
       window.scrollTo({ top: y, behavior: "smooth" });
     }
   };
@@ -30,204 +43,241 @@ export const HelpContent = () => {
   const ailaId = searchParams.get("ailaId");
 
   return (
-    <>
-      <div className="mx-auto mt-30 h-[100vh] w-full max-w-[1280px] px-9">
-        <div className="mb-27 flex justify-between gap-3">
-          <div className="hidden  sm:block sm:min-w-[300px]">
-            <h1 className="mb-24 text-4xl font-bold">Help</h1>
-            <ul className="relative top-32 sm:sticky ">
-              <li>
-                <button
-                  className="mb-14 text-blue underline"
-                  onClick={() => scrollToRefWithOffset(startingRef)}
-                >
-                  Starting your first lesson
-                </button>
-              </li>
-              <li>
-                <button
-                  className="mb-14 text-blue underline"
-                  onClick={() => scrollToRefWithOffset(structureRef)}
-                >
-                  Structure of an Oak lesson
-                </button>
-              </li>
-              <li>
-                <button
-                  className="mb-14 text-blue underline"
-                  onClick={() => scrollToRefWithOffset(downloadsRef)}
-                >
-                  Downloads
-                </button>
-              </li>
-              <li>
-                <button
-                  className="mb-14 text-blue underline"
-                  onClick={() => scrollToRefWithOffset(creatingRef)}
-                >
-                  Co-creating your lesson
-                </button>
-              </li>
-              <li>
-                <button
-                  className="mb-14 text-blue underline"
-                  onClick={() => scrollToRefWithOffset(reviewingRef)}
-                >
-                  Reviewing and editing
-                </button>
-              </li>
-              <li>
-                <button
-                  className="mb-14 text-blue underline"
-                  onClick={() => scrollToRefWithOffset(downloadingRef)}
-                >
-                  Downloading and sharing
-                </button>
-              </li>
-              <li>
-                <button
-                  className="mb-14 text-blue underline"
-                  onClick={() => scrollToRefWithOffset(aiRef)}
-                >
-                  AI and accuracy
-                </button>
-              </li>
-            </ul>
-          </div>
-
-          <div className="mb-40 max-w-[800px]">
-            <div className="mb-20 mt-10 sm:hidden">
+    <OakMaxWidth>
+      <OakGrid>
+        <OakGridArea $colSpan={[0, 0, 3]}>
+          <OakBox $display={["none", "none", "block"]}>
+            <OakBox $position={"fixed"}>
+              <OakBox $pb="inner-padding-xl">
+                <OakHeading tag="h1" $font="heading-3">
+                  Help
+                </OakHeading>
+              </OakBox>
+              <OakUL>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink onClick={() => scrollToRefWithOffset(startingRef)}>
+                    Starting your first lesson
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink onClick={() => scrollToRefWithOffset(structureRef)}>
+                    Structure of an Oak lesson
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink
+                    onClick={() => scrollToRefWithOffset(learningCycles)}
+                  >
+                    Learning cycles
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink onClick={() => scrollToRefWithOffset(downloadsRef)}>
+                    Downloads
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink
+                    onClick={() =>
+                      scrollToRefWithOffset(additionalMaterialsRef)
+                    }
+                  >
+                    Examples of additional materials
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink onClick={() => scrollToRefWithOffset(creatingRef)}>
+                    Co-creating your lesson
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink onClick={() => scrollToRefWithOffset(reviewingRef)}>
+                    Reviewing and editing
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink
+                    onClick={() => scrollToRefWithOffset(downloadingRef)}
+                  >
+                    Downloading and sharing
+                  </OakLink>
+                </OakLI>
+                <OakLI $pv="inner-padding-xs">
+                  <OakLink onClick={() => scrollToRefWithOffset(aiRef)}>
+                    AI and accuracy
+                  </OakLink>
+                </OakLI>
+              </OakUL>
+            </OakBox>
+          </OakBox>
+        </OakGridArea>
+        <OakGridArea $colStart={[0, 0, 5]} $colSpan={[12, 12, 9]}>
+          <OakFlex
+            $flexDirection={"column"}
+            $position={"relative"}
+            $gap={"space-between-m2"}
+          >
+            <OakBox $display={["block", "none", "none"]}>
               <OakLink
                 href={ailaId ? `/aila/${ailaId}` : "/aila"}
                 iconName="chevron-left"
               >
                 Back to Aila
               </OakLink>
-            </div>
+            </OakBox>
 
-            <div className="mb-20">
+            <OakBox $mb={"space-between-xs"}>
               <GetInTouchBox />
-            </div>
-            <h2 className="mb-4  text-2xl font-bold" ref={startingRef}>
-              Starting your first lesson
-            </h2>
-            <p className="mb-4">
-              Create your first lesson by typing a lesson title and key stage
-              into the input box on the first screen and clicking the arrow key.
-              This will create the starting point of your lesson. You can get
-              back to the initial screen by clicking &apos;New lesson&apos; in
-              the main navigation.
-            </p>
-            <h2 className="mb-8 mt-20 text-2xl font-bold" ref={structureRef}>
-              Structure of an Oak lesson
-            </h2>
-            <p className="mb-8">
-              Lessons are created using Oak&apos;s curriculum principles and
-              include the following sections:
-            </p>
-            <ul className="mb-6 list-disc pl-12">
-              <li>Learning outcome</li>
-              <li>Learning cycle outcomes</li>
-              <li>Prior knowledge</li>
-              <li>Key learning points</li>
-              <li>Misconceptions</li>
-              <li>Starter quiz</li>
-              <li>Learning cycles</li>
-              <li>Exit quiz</li>
-              <li>Additional materials (optional)</li>
-            </ul>
-            <h2 className="mb-8 mt-20 text-2xl font-bold">Learning cycles</h2>
-            <p className="mb-4">Each learning cycle includes 4 key sections:</p>
-            <ul className="mb-6 list-disc pl-12">
-              <li>Explanation</li>
-              <li>Checks for understanding</li>
-              <li>Practice</li>
-              <li>Feedback</li>
-            </ul>
-            <h2 className="mb-8 mt-20 text-2xl font-bold" ref={downloadsRef}>
-              Downloads
-            </h2>
-            <p className="mb-4">
-              Once the lesson has been created (and all sections are complete)
-              you will be able to download the following documents:
-            </p>
-            <ul className="mb-6 list-disc pl-12">
-              <li>Lesson, including all sections (PDF/Docx file)</li>
-              <li>Starter quiz (PDF/Docx file)</li>
-              <li>Slides (PDF/PPTX file)</li>
-              <li>Exit quiz (PDF/Docx file)</li>
-            </ul>
-            <p className="mb-4">
-              If you have a Google account, you will also be able to edit these
-              documents directly.
-            </p>
-            <h2 className="mb-8 mt-20 text-2xl font-bold">
-              Examples of additional materials
-            </h2>
-            <p className="mb-4">
-              Health and safety information, lesson narration, model answers or
-              additional practice tasks.
-            </p>
-            <h2 className="mb-8 mt-20 text-2xl font-bold" ref={creatingRef}>
-              Co-creating your lesson
-            </h2>
-            <p className="mb-4">
-              Aila, Oak&apos;s AI lesson assistant will guide you through the
-              process of co-creating each section of your lesson on the
-              left-hand side of the screen. The lesson output will be generated
-              on the right-hand side.
-            </p>
-            <h2 className="mb-8 mt-20 text-2xl font-bold" ref={reviewingRef}>
-              Reviewing and editing
-            </h2>
-            <p className="mb-4">
-              Aila will pause at key points during the lesson creation and will
-              ask you to review the content generated. You can ask Aila to adapt
-              each section, for example:
-            </p>
-            <ul className="mb-6 list-disc pl-12">
-              <li>adapt the content for a specific reading age.</li>
-              <li>
-                add specific case studies or examples to your explanations.
-              </li>
-              <li>change the practice tasks for you.</li>
-              <li>
-                add a narrative for each learning cycle to the Additional
-                Materials.
-              </li>
-            </ul>
-            <h2 className="mb-8 mt-20 text-2xl font-bold" ref={downloadingRef}>
-              Downloading and sharing
-            </h2>
-            <p className="mb-4">
-              When you have completed all the sections in the lesson, you will
-              be able to download the lesson resources, including the full
-              lesson plan (which includes all sections), editable slides and
-              starter and exit quizzes. You can also share your lesson as a
-              link, which can be viewed online.
-            </p>
-            <h2 className="mb-8 mt-20 text-2xl font-bold" ref={aiRef}>
-              AI and accuracy
-            </h2>
-            <p className="mb-4">
-              Retrieval Augmented Generation is used to integrate Oak content
-              into your lessons, improving the accuracy of the content produced.
-              AI is not 100% accurate and mistakes can still be made. Remember,
-              you&apos;re still the expert, so please ensure all content is
-              reviewed before using it in a classroom or sharing.
-            </p>
-          </div>
-        </div>
-      </div>
-    </>
+            </OakBox>
+            <OakBox ref={startingRef}>
+              <OakHeading $mb={"space-between-ssx"} $font="heading-5" tag="h2">
+                Starting your first lesson
+              </OakHeading>
+              <OakP>
+                Create your first lesson by typing a lesson title and key stage
+                into the input box on the first screen and clicking the arrow
+                key. This will create the starting point of your lesson. You can
+                get back to the initial screen by clicking &apos;New
+                lesson&apos; in the main navigation.
+              </OakP>
+            </OakBox>
+            <OakBox ref={structureRef}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                Structure of an Oak lesson
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Lessons are created using Oak&apos;s curriculum principles and
+                include the following sections:
+              </OakP>
+              <OakUL className="mb-6 list-disc pl-12">
+                <OakLI>Lesson details</OakLI>
+                <OakLI>Learning outcome</OakLI>
+                <OakLI>Learning cycle outcomes</OakLI>
+                <OakLI>Prior knowledge</OakLI>
+                <OakLI>Key learning points</OakLI>
+                <OakLI>Misconceptions</OakLI>
+                <OakLI>Keywords</OakLI>
+                <OakLI>Starter quiz</OakLI>
+                <OakLI>Learning cycles</OakLI>
+                <OakLI>Exit quiz</OakLI>
+                <OakLI>Additional materials (optional)</OakLI>
+              </OakUL>
+            </OakBox>
+            <OakBox ref={learningCycles}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                Learning cycles
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Each learning cycle includes 4 key sections:
+              </OakP>
+              <OakUL className="mb-6 list-disc pl-12">
+                <OakLI>Explanation</OakLI>
+                <OakLI>Checks for understanding</OakLI>
+                <OakLI>Practice</OakLI>
+                <OakLI>Feedback</OakLI>
+              </OakUL>
+            </OakBox>
+            <OakBox ref={downloadsRef}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                Downloads
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Once the lesson has been created (and all sections are complete)
+                you will be able to download the following documents:
+              </OakP>
+              <OakUL className="mb-6 list-disc pl-12">
+                <OakLI>Lesson plan, including all sections</OakLI>
+                <OakLI>Starter quiz (PDF/Docx file)</OakLI>
+                <OakLI>Slides (PDF/PPTX file)</OakLI>
+                <OakLI>Worksheet (PDF/Docx file)</OakLI>
+                <OakLI>Exit quiz (PDF/Docx file)</OakLI>
+                <OakLI>Additional materials (PDF/Docx file)</OakLI>
+              </OakUL>
+              <OakP $mt={"space-between-xs"}>
+                If you have a Google account, you will also be able to edit
+                these documents directly.
+              </OakP>
+            </OakBox>
+            <OakBox ref={additionalMaterialsRef}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                Examples of additional materials
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Case study context sheet, an essay title with success criteria
+                for pupils to complete for homework, suggestions for alternative
+                art or equipment you can use for your lesson.
+              </OakP>
+            </OakBox>
+            <OakBox ref={creatingRef}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                Co-creating your lesson
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Aila, Oak&apos;s AI lesson assistant will guide you through the
+                process of co-creating each section of your lesson on the
+                left-hand side of the screen. The lesson output will be
+                generated on the right-hand side.
+              </OakP>
+            </OakBox>
+            <OakBox ref={reviewingRef}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                Reviewing and editing
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Aila will pause at key points during the lesson creation and
+                will ask you to review the content generated. You can ask Aila
+                to adapt each section, for example:
+              </OakP>
+              <OakUL className="mb-6 list-disc pl-12">
+                <OakLI>
+                  increase or decrease the literacy level of your keywords
+                </OakLI>
+                <OakLI>
+                  add specific case studies or examples to your explanations
+                </OakLI>
+                <OakLI>change the practice tasks for you</OakLI>
+                <OakLI>
+                  add a narrative for each learning cycle to the Additional
+                  Materials
+                </OakLI>
+              </OakUL>
+            </OakBox>
+            <OakBox ref={downloadingRef}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                Downloading and sharing
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Once you’ve completed all the sections in the lesson, you’ll be
+                able to download the full set of lesson resources. This includes
+                the complete lesson plan (covering all sections), editable
+                slides, starter and exit quizzes, a worksheet with your practice
+                tasks, and any additional materials you’ve created. You can also
+                share your lesson via a link, allowing it to be viewed online.
+              </OakP>
+            </OakBox>
+            <OakBox ref={aiRef}>
+              <OakHeading $mb={"space-between-xs"} $font="heading-5" tag="h2">
+                AI and accuracy
+              </OakHeading>
+              <OakP $mb={"space-between-xs"}>
+                Retrieval augmented generation is used to integrate Oak content
+                into your lessons, improving the accuracy of the content
+                produced. AI is not 100% accurate and mistakes can still be
+                made. Remember, you’re still the expert, so please ensure all
+                content is reviewed before using it in a classroom or sharing.
+              </OakP>
+            </OakBox>
+          </OakFlex>
+        </OakGridArea>
+      </OakGrid>
+    </OakMaxWidth>
   );
 };
 
-export default function HelpPage() {
+export default function HelpPageView() {
   return (
-    <>
-      <Header />
+    <Layout>
       <HelpContent />
-    </>
+    </Layout>
   );
 }
diff --git a/apps/nextjs/src/app/aila/page-contents.tsx b/apps/nextjs/src/app/aila/page-contents.tsx
index 49119a78d..8dce45b37 100644
--- a/apps/nextjs/src/app/aila/page-contents.tsx
+++ b/apps/nextjs/src/app/aila/page-contents.tsx
@@ -11,7 +11,7 @@ const ChatPageContents = ({ id }: { readonly id: string }) => {
   return (
     <Layout>
       <LessonPlanTrackingProvider chatId={id}>
-        <ChatProvider key={`chat-${id}`} id={id}>
+        <ChatProvider id={id}>
           <Chat />
         </ChatProvider>
       </LessonPlanTrackingProvider>
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 37d46e7f6..cb4b8031d 100644
--- a/apps/nextjs/src/app/api/aila-download-all/route.ts
+++ b/apps/nextjs/src/app/api/aila-download-all/route.ts
@@ -1,6 +1,5 @@
 import { auth } from "@clerk/nextjs/server";
-import type { LessonExportType } from "@oakai/db";
-import { prisma } from "@oakai/db";
+import { prisma, type LessonExportType } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
 import { kv } from "@vercel/kv";
@@ -9,6 +8,7 @@ import { PassThrough } from "stream";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
+import { saveDownloadEvent } from "../aila-download/downloadHelpers";
 import { sanitizeFilename } from "../sanitizeFilename";
 
 type FileIdsAndFormats = {
@@ -16,48 +16,6 @@ type FileIdsAndFormats = {
   formats: ReadonlyArray<"pptx" | "docx" | "pdf">;
 }[];
 
-function getReadableExportType(exportType: LessonExportType) {
-  switch (exportType) {
-    case "EXIT_QUIZ_DOC":
-      return "Exit quiz";
-    case "LESSON_PLAN_DOC":
-      return "Lesson plan";
-    case "STARTER_QUIZ_DOC":
-      return "Starter quiz";
-    case "WORKSHEET_SLIDES":
-      return "Worksheet";
-    case "LESSON_SLIDES_SLIDES":
-      return "Lesson slides";
-    case "ADDITIONAL_MATERIALS_DOCS":
-      return "Additional materials";
-  }
-}
-
-async function saveDownloadEvent({
-  lessonExportId,
-  downloadedBy,
-  ext,
-}: {
-  lessonExportId: string;
-  downloadedBy: string;
-  ext: string;
-}) {
-  try {
-    await prisma.lessonExportDownload.create({
-      data: {
-        lessonExportId,
-        downloadedBy,
-        ext,
-      },
-    });
-  } catch (error) {
-    Sentry.captureException(error, {
-      level: "warning",
-      extra: { lessonExportId, downloadedBy, ext },
-    });
-  }
-}
-
 function nodePassThroughToReadableStream(passThrough: PassThrough) {
   return new ReadableStream({
     start(controller) {
@@ -77,6 +35,23 @@ function nodePassThroughToReadableStream(passThrough: PassThrough) {
   });
 }
 
+function getReadableExportType(exportType: LessonExportType) {
+  switch (exportType) {
+    case "EXIT_QUIZ_DOC":
+      return "Exit quiz";
+    case "LESSON_PLAN_DOC":
+      return "Lesson plan";
+    case "STARTER_QUIZ_DOC":
+      return "Starter quiz";
+    case "WORKSHEET_SLIDES":
+      return "Worksheet";
+    case "LESSON_SLIDES_SLIDES":
+      return "Lesson slides";
+    case "ADDITIONAL_MATERIALS_DOCS":
+      return "Additional materials";
+  }
+}
+
 async function getHandler(req: Request): Promise<Response> {
   const { searchParams } = new URL(req.url);
   const fileIdsParam = searchParams.get("fileIds");
diff --git a/apps/nextjs/src/app/api/aila-download/downloadHelpers.ts b/apps/nextjs/src/app/api/aila-download/downloadHelpers.ts
new file mode 100644
index 000000000..7ce92b445
--- /dev/null
+++ b/apps/nextjs/src/app/api/aila-download/downloadHelpers.ts
@@ -0,0 +1,27 @@
+import { prisma } from "@oakai/db";
+import * as Sentry from "@sentry/node";
+
+export async function saveDownloadEvent({
+  lessonExportId,
+  downloadedBy,
+  ext,
+}: {
+  lessonExportId: string;
+  downloadedBy: string;
+  ext: string;
+}) {
+  try {
+    await prisma.lessonExportDownload.create({
+      data: {
+        lessonExportId,
+        downloadedBy,
+        ext,
+      },
+    });
+  } catch (error) {
+    Sentry.captureException(error, {
+      level: "warning",
+      extra: { lessonExportId, downloadedBy, ext },
+    });
+  }
+}
diff --git a/apps/nextjs/src/app/api/aila-download/route.ts b/apps/nextjs/src/app/api/aila-download/route.ts
index 64c9010bc..6177ba41e 100644
--- a/apps/nextjs/src/app/api/aila-download/route.ts
+++ b/apps/nextjs/src/app/api/aila-download/route.ts
@@ -1,12 +1,12 @@
 import { auth } from "@clerk/nextjs/server";
-import type { LessonExportType } from "@oakai/db";
-import { prisma } from "@oakai/db";
+import { prisma, type LessonExportType } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
 
 import { withSentry } from "@/lib/sentry/withSentry";
 
 import { sanitizeFilename } from "../sanitizeFilename";
+import { saveDownloadEvent } from "./downloadHelpers";
 
 // From: https://www.ericburel.tech/blog/nextjs-stream-files
 async function* nodeStreamToIterator(stream: NodeJS.ReadableStream) {
@@ -46,31 +46,6 @@ function getReadableExportType(exportType: LessonExportType) {
   }
 }
 
-async function saveDownloadEvent({
-  lessonExportId,
-  downloadedBy,
-  ext,
-}: {
-  lessonExportId: string;
-  downloadedBy: string;
-  ext: string;
-}) {
-  try {
-    await prisma.lessonExportDownload.create({
-      data: {
-        lessonExportId,
-        downloadedBy,
-        ext,
-      },
-    });
-  } catch (error) {
-    Sentry.captureException(error, {
-      level: "warning",
-      extra: { lessonExportId, downloadedBy, ext },
-    });
-  }
-}
-
 async function getHandler(req: Request): Promise<Response> {
   const { searchParams } = new URL(req.url);
 
@@ -135,7 +110,7 @@ async function getHandler(req: Request): Promise<Response> {
     });
   }
 
-  saveDownloadEvent({
+  await saveDownloadEvent({
     lessonExportId: lessonExport.id,
     downloadedBy: userId,
     ext,
diff --git a/apps/nextjs/src/app/api/chat/chatHandler.ts b/apps/nextjs/src/app/api/chat/chatHandler.ts
index 7ab8bf78c..20f28706a 100644
--- a/apps/nextjs/src/app/api/chat/chatHandler.ts
+++ b/apps/nextjs/src/app/api/chat/chatHandler.ts
@@ -1,10 +1,10 @@
 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 {
   AilaOptions,
   AilaPublicChatOptions,
+  AilaInitializationOptions,
 } from "@oakai/aila/src/core/types";
 import { AilaAmericanisms } from "@oakai/aila/src/features/americanisms/AilaAmericanisms";
 import {
@@ -40,7 +40,7 @@ export const maxDuration = 300;
 const prisma: PrismaClientWithAccelerate = globalPrisma;
 
 export async function GET() {
-  return new Response("Chat API is working", { status: 200 });
+  return Promise.resolve(new Response("Chat API is working", { status: 200 }));
 }
 
 async function setupChatHandler(req: NextRequest) {
diff --git a/apps/nextjs/src/app/api/chat/config.ts b/apps/nextjs/src/app/api/chat/config.ts
index 4f32fe969..c2aacf02b 100644
--- a/apps/nextjs/src/app/api/chat/config.ts
+++ b/apps/nextjs/src/app/api/chat/config.ts
@@ -19,9 +19,9 @@ export const defaultConfig: Config = {
     const webActionsPlugin = createWebActionsPlugin(globalPrisma);
     const createdAila = new Aila({
       ...options,
-      plugins: [...(options.plugins || []), webActionsPlugin],
+      plugins: [...(options.plugins ?? []), webActionsPlugin],
       prisma: options.prisma ?? globalPrisma,
-      chat: options.chat || {
+      chat: options.chat ?? {
         id: nanoid(),
         userId: undefined,
       },
diff --git a/apps/nextjs/src/app/api/chat/errorHandling.test.ts b/apps/nextjs/src/app/api/chat/errorHandling.test.ts
index c9f0ebbd3..09e9aa0a4 100644
--- a/apps/nextjs/src/app/api/chat/errorHandling.test.ts
+++ b/apps/nextjs/src/app/api/chat/errorHandling.test.ts
@@ -27,7 +27,6 @@ describe("handleChatException", () => {
 
       const span = { setTag: jest.fn() } as unknown as TracingSpan;
       const error = new AilaThreatDetectionError("user_abc", "test error");
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const prisma = {} as unknown as PrismaClientWithAccelerate;
 
       const response = await handleChatException(
@@ -54,7 +53,6 @@ describe("handleChatException", () => {
     it("should return an error chat message", async () => {
       const span = { setTag: jest.fn() } as unknown as TracingSpan;
       const error = new AilaAuthenticationError("test error");
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const prisma = {} as unknown as PrismaClientWithAccelerate;
 
       const response = await handleChatException(
@@ -84,7 +82,6 @@ describe("handleChatException", () => {
         100,
         Date.now() + 3600 * 1000,
       );
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const prisma = {} as unknown as PrismaClientWithAccelerate;
 
       const response = await handleChatException(
@@ -117,7 +114,6 @@ describe("handleChatException", () => {
     it("should return an error chat message", async () => {
       const span = { setTag: jest.fn() } as unknown as TracingSpan;
       const error = new UserBannedError("test error");
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const prisma = {} as unknown as PrismaClientWithAccelerate;
 
       const response = await handleChatException(
diff --git a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts
index b928aff0d..2b7523f5b 100644
--- a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts
+++ b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts
@@ -9,7 +9,7 @@ const log = aiLogger("fixtures");
 
 export class FixtureRecordLLMService implements LLMService {
   name = "FixtureRecordLLM";
-  private _openAIService: OpenAIService;
+  private readonly _openAIService: OpenAIService;
 
   constructor(
     public fixtureName: string,
diff --git a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts
index cb0d5d686..68d340390 100644
--- a/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts
+++ b/apps/nextjs/src/app/api/chat/fixtures/FixtureRecordOpenAiClient.ts
@@ -3,7 +3,7 @@ import { createOpenAIClient } from "@oakai/core/src/llm/openai";
 import { aiLogger } from "@oakai/logger";
 import fs from "fs/promises";
 import type OpenAI from "openai";
-import type { ChatCompletionCreateParamsNonStreaming } from "openai/resources";
+import type { ChatCompletionCreateParamsNonStreaming } from "openai/resources/index.mjs";
 
 const log = aiLogger("fixtures");
 
diff --git a/apps/nextjs/src/app/api/chat/webActionsPlugin.ts b/apps/nextjs/src/app/api/chat/webActionsPlugin.ts
index 08b5d547d..07afb0298 100644
--- a/apps/nextjs/src/app/api/chat/webActionsPlugin.ts
+++ b/apps/nextjs/src/app/api/chat/webActionsPlugin.ts
@@ -64,7 +64,7 @@ export const createWebActionsPlugin: PluginCreator = (
       data: {
         chatId: aila.chatId || "Unknown",
         categories: moderation.categories as string[],
-        justification: moderation.justification || "Unknown",
+        justification: moderation.justification ?? "Unknown",
       },
     });
 
diff --git a/apps/nextjs/src/app/api/cron-jobs/expired-exports/route.ts b/apps/nextjs/src/app/api/cron-jobs/expired-exports/route.ts
index ff1e86245..c2b0ca4d5 100644
--- a/apps/nextjs/src/app/api/cron-jobs/expired-exports/route.ts
+++ b/apps/nextjs/src/app/api/cron-jobs/expired-exports/route.ts
@@ -1,3 +1,4 @@
+import type { drive_v3 } from "@googleapis/drive";
 import { prisma } from "@oakai/db";
 import { googleDrive } from "@oakai/exports/src/gSuite/drive/client";
 import { aiLogger } from "@oakai/logger";
@@ -54,14 +55,13 @@ async function updateExpiredAtAndDelete(fileIds: string[]) {
       log.error(`Error processing file with gdriveFileId: ${id}`, error);
       failedIds.push(id);
     }
-
-    if (failedIds.length > 0) {
-      const errorMessage = `Failed to process the following file IDs: ${failedIds.join(
-        ", ",
-      )}`;
-      log.error(errorMessage);
-      throw new Error(errorMessage);
-    }
+  }
+  if (failedIds.length > 0) {
+    const errorMessage = `Failed to process the following file IDs: ${failedIds.join(
+      ", ",
+    )}`;
+    log.error(errorMessage);
+    throw new Error(errorMessage);
   }
 }
 
@@ -89,7 +89,7 @@ async function fetchExpiredExports({
     });
 
     const files =
-      res.data.files?.filter((file) => file.ownedByMe === true) || [];
+      res.data.files?.filter((file) => file.ownedByMe === true) ?? [];
 
     if (files.length === 0) {
       log.info(
@@ -127,19 +127,35 @@ export async function GET(request: NextRequest) {
       return new Response("Unauthorized", { status: 401 });
     }
 
-    const files = await fetchExpiredExports({ folderId, daysAgo: 14 });
+    let files: drive_v3.Schema$File[] | null;
+    let hasMoreFiles = true;
 
-    if (!files || files.length === 0) {
-      return new Response("No expired files found", { status: 404 });
-    }
+    while (hasMoreFiles) {
+      files = await fetchExpiredExports({ folderId, daysAgo: 14 });
+
+      if (!files || files.length === 0) {
+        log.info("No expired files found.");
+        hasMoreFiles = false;
+        break;
+      }
 
-    const validFileIds = files.map((file) => file.id).filter(isTruthy);
+      const validFileIds = files.map((file) => file.id).filter(isTruthy);
 
-    await updateExpiredAtAndDelete(validFileIds);
+      if (validFileIds.length === 0) {
+        log.info("No valid file IDs to process.");
+        hasMoreFiles = false;
+        break;
+      }
+
+      await updateExpiredAtAndDelete(validFileIds);
+    }
+
+    return new Response("All expired files processed successfully.", {
+      status: 200,
+    });
   } catch (error) {
     Sentry.captureException(error);
+    log.error("An error occurred during the cron job execution:", error);
     return new Response("Internal Server Error", { status: 500 });
   }
-
-  return new Response(JSON.stringify({ success: true }), { status: 200 });
 }
diff --git a/apps/nextjs/src/app/api/cron-jobs/google-drive-size-quota/route.ts b/apps/nextjs/src/app/api/cron-jobs/google-drive-size-quota/route.ts
new file mode 100644
index 000000000..8590fba0a
--- /dev/null
+++ b/apps/nextjs/src/app/api/cron-jobs/google-drive-size-quota/route.ts
@@ -0,0 +1,114 @@
+import {
+  slackAiOpsNotificationChannelId,
+  slackWebClient,
+} from "@oakai/core/src/utils/slack";
+import { googleDrive } from "@oakai/exports/src/gSuite/drive/client";
+import { aiLogger } from "@oakai/logger";
+import * as Sentry from "@sentry/node";
+import type { NextRequest } from "next/server";
+
+const log = aiLogger("cron");
+
+const requiredEnvVars = ["CRON_SECRET", "SLACK_AI_OPS_NOTIFICATION_CHANNEL_ID"];
+
+requiredEnvVars.forEach((envVar) => {
+  if (!process.env[envVar]) {
+    throw new Error(`Environment variable ${envVar} is not set.`);
+  }
+});
+
+async function fetchDriveUsage() {
+  try {
+    const res = await googleDrive.about.get({
+      fields: "storageQuota, user(emailAddress)",
+    });
+
+    const storageQuota = res.data.storageQuota;
+    const userEmail = res.data.user?.emailAddress;
+
+    if (!storageQuota) {
+      throw new Error("Unable to fetch storage quota information.");
+    }
+
+    const usage = {
+      limit: parseInt(storageQuota.limit ?? "0", 10),
+      usage: parseInt(storageQuota.usage ?? "0", 10),
+      userEmail,
+    };
+
+    log.info(
+      `Drive usage retrieved: ${usage.usage} bytes used of ${usage.limit} bytes total, ${userEmail}.`,
+    );
+
+    return usage;
+  } catch (error) {
+    log.error("Failed to fetch Google Drive usage details:", error);
+    throw error;
+  }
+}
+
+async function checkDriveUsageThreshold(thresholdPercentage: number = 80) {
+  try {
+    const usage = await fetchDriveUsage();
+
+    if (usage.limit === 0) {
+      throw new Error("Storage limit is reported as zero, which is invalid.");
+    }
+
+    const usagePercentage = (usage.usage / usage.limit) * 100;
+
+    log.info(
+      `Drive usage percentage: ${usagePercentage.toFixed(
+        2,
+      )}%. Threshold is set at ${thresholdPercentage}%.`,
+    );
+
+    if (usagePercentage > thresholdPercentage) {
+      const errorMessage = `Drive usage is at ${usagePercentage.toFixed(
+        2,
+      )}% of the total limit, exceeding the threshold of ${thresholdPercentage}% : ${usage.userEmail}`;
+      log.error(errorMessage);
+      Sentry.captureMessage(errorMessage);
+      await slackWebClient.chat.postMessage({
+        channel: slackAiOpsNotificationChannelId,
+        text: errorMessage,
+      });
+    }
+  } catch (error) {
+    log.error("Error during Drive usage check:", error);
+    Sentry.captureException(error);
+    throw error;
+  }
+}
+
+export async function GET(request: NextRequest) {
+  try {
+    const authHeader = request.headers.get("authorization");
+    const cronSecret = process.env.CRON_SECRET;
+
+    if (!cronSecret) {
+      log.error("Missing cron secret");
+      return new Response("Missing cron secret", { status: 500 });
+    }
+
+    if (authHeader !== `Bearer ${cronSecret}`) {
+      log.error("Authorization failed. Invalid token.");
+      return new Response("Unauthorized", { status: 401 });
+    }
+
+    log.info("Starting Google Drive usage check...");
+
+    await checkDriveUsageThreshold(80);
+
+    return new Response("Drive usage check completed successfully.", {
+      status: 200,
+    });
+  } catch (error) {
+    log.error(
+      "An error occurred during the Drive usage check cron job:",
+      error,
+    );
+    Sentry.captureException(error);
+    return new Response("Internal Server Error", { status: 500 });
+  }
+}
diff --git a/apps/nextjs/src/app/faqs/index.stories.tsx b/apps/nextjs/src/app/faqs/index.stories.tsx
index 7eef2c06a..937727546 100644
--- a/apps/nextjs/src/app/faqs/index.stories.tsx
+++ b/apps/nextjs/src/app/faqs/index.stories.tsx
@@ -1,14 +1,19 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
+import { chromaticParams } from "@/storybook/chromatic";
+
 import { FAQPageContent } from ".";
 
-const meta: Meta<typeof FAQPageContent> = {
+const meta = {
   title: "Pages/FAQs",
   component: FAQPageContent,
-};
+  parameters: {
+    ...chromaticParams(["mobile", "desktop"]),
+  },
+} satisfies Meta<typeof FAQPageContent>;
 
 export default meta;
-type Story = StoryObj<typeof FAQPageContent>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
diff --git a/apps/nextjs/src/app/faqs/index.tsx b/apps/nextjs/src/app/faqs/index.tsx
index d311c0468..ab0e60f01 100644
--- a/apps/nextjs/src/app/faqs/index.tsx
+++ b/apps/nextjs/src/app/faqs/index.tsx
@@ -28,828 +28,817 @@ export const FAQPageContent = () => {
   const concernsRef = useRef(null);
   const dataRef = useRef(null);
   const scrollToRefWithOffset = (ref) => {
-    if (ref && ref.current) {
+    if (ref?.current) {
       const yOffset = -72; // Adjust this value as needed
       const y =
-        ref.current.getBoundingClientRect().top + window.pageYOffset + yOffset;
+        ref.current.getBoundingClientRect().top + window.scrollY + yOffset;
       window.scrollTo({ top: y, behavior: "smooth" });
     }
   };
   return (
-    <>
-      <OakMaxWidth>
-        <OakFlex $justifyContent="space-between">
-          <OakBox $display={["none", "block"]}>
-            <OakBox $pb="inner-padding-xl8" $mb="space-between-xl">
-              <OakHeading tag="h1" $font="heading-3">
-                FAQs
-              </OakHeading>
-            </OakBox>
-
-            <OakUL $position="sticky" $top="all-spacing-14">
-              <OakLI $pv="inner-padding-ssx">
-                <OakLink onClick={() => scrollToRefWithOffset(startingRef)}>
-                  Getting started
-                </OakLink>
-              </OakLI>
-              <OakLI $pv="inner-padding-ssx">
-                <OakLink onClick={() => scrollToRefWithOffset(featuresRef)}>
-                  Features and functionality
+    <OakMaxWidth>
+      <OakFlex $justifyContent="space-between">
+        <OakBox $display={["none", "block"]}>
+          <OakBox $pb="inner-padding-xl8" $mb="space-between-xl">
+            <OakHeading tag="h1" $font="heading-3">
+              FAQs
+            </OakHeading>
+          </OakBox>
+
+          <OakUL $position="sticky" $top="all-spacing-14">
+            <OakLI $pv="inner-padding-ssx">
+              <OakLink onClick={() => scrollToRefWithOffset(startingRef)}>
+                Getting started
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-ssx">
+              <OakLink onClick={() => scrollToRefWithOffset(featuresRef)}>
+                Features and functionality
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-ssx">
+              <OakLink onClick={() => scrollToRefWithOffset(supportRef)}>
+                Support and assistance
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-ssx">
+              <OakLink onClick={() => scrollToRefWithOffset(accessibilityRef)}>
+                Accessibility
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-ssx">
+              <OakLink onClick={() => scrollToRefWithOffset(usageRef)}>
+                Usage and best practices
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-xs">
+              <OakLink onClick={() => scrollToRefWithOffset(technicalRef)}>
+                Technical
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-xs">
+              <OakLink onClick={() => scrollToRefWithOffset(updatesRef)}>
+                Updates and enhancements
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-xs">
+              <OakLink onClick={() => scrollToRefWithOffset(concernsRef)}>
+                Other concerns
+              </OakLink>
+            </OakLI>
+            <OakLI $pv="inner-padding-xs">
+              <OakLink onClick={() => scrollToRefWithOffset(dataRef)}>
+                Data privacy and security
+              </OakLink>
+            </OakLI>
+          </OakUL>
+        </OakBox>
+
+        <OakBoxCustomMaxWidth customMaxWidth={850}>
+          <div className="mb-20">
+            <GetInTouchBox />
+          </div>
+
+          <div ref={startingRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Getting started
+            </OakHeading>
+          </div>
+
+          <div className="mb-4">
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              How do I sign up for Aila?
+            </OakHeading>
+            <OakP>
+              You can sign up to access Aila and our other AI experiments{" "}
+              <OakLink href="/aila">here</OakLink>.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              How much does it cost to use Aila?
+            </OakHeading>
+            <OakP>
+              As with all of Oak&apos;s resources, Aila is completely free to
+              use. There are some fair use limits that we have applied that you
+              may reach if your use appears to be excessive.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              What are the system requirements for using Aila?
+            </OakHeading>
+            <OakP>
+              We aim to make our resources as accessible as possible. Aila will
+              be available to any teacher with access to a laptop or computer
+              and the Internet. We currently don&apos;t support mobile usage.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              What is a beta product?
+            </OakHeading>
+            <OakP>
+              Aila is in the beta phase, and we are still actively testing and
+              developing Aila. This phase helps identify issues by allowing
+              teachers to use the Aila in real-life conditions. Aila is not
+              perfect, and will make some mistakes!{" "}
+              <OakLink href="https://docs.google.com/forms/d/e/1FAIpQLSf2AWtTtr4JISeMV4BY5LCMYhDFPz0RPNdXzmy_vjk4BmM69Q/viewform">
+                Your feedback is essential
+              </OakLink>{" "}
+              to refine and improve Aila.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-m"
+              $mb="space-between-l"
+            >
+              Is there a tutorial or guide available to help me get started?
+            </OakHeading>
+            <OakP>
+              Aila provides helpful tips and prompts for getting started. If you
+              need additional support, you can take a look at our{" "}
+              <OakLink href="https://labs.thenational.academy/aila/help">
+                help
+              </OakLink>{" "}
+              section, or contact us.
+            </OakP>
+          </div>
+
+          <div ref={featuresRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Features and functionality
+            </OakHeading>
+          </div>
+
+          <div className="mb-4">
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              What features does Aila offer?
+            </OakHeading>
+            <OakP>
+              Aila offers a range of features to help teachers create
+              high-quality lesson plans and resources. It is designed to ensure
+              that lesson plans meet national curriculum standards. You can edit
+              your lesson plan using Aila, quickly generating downloadable
+              lesson plans, editable slide decks, and starter and exit quizzes.
+              You may also choose to adapt or add to the resources after
+              download.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Can I customise lessons?
+            </OakHeading>
+            <OakP>
+              Yes! Aila is designed to guide you through the process of
+              co-creating a lesson. The more you specify to Aila, the better
+              your lesson will be. You can ask Aila to adapt the lesson to suit
+              your geographical context, the reading age of students in your
+              class, or any other additional needs your pupils may have. The
+              materials you produce with Aila are also fully editable.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              What are the advantages of using Aila?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Aila has been based upon Oak&apos;s{" "}
+              <OakLink href="https://www.thenational.academy/blog/our-approach-to-curriculum">
+                curriculum principles
+              </OakLink>{" "}
+              Aila is designed to take you through the process that an expert
+              teacher would use to plan a lesson; starting with your lesson
+              outcome and breaking that down into manageable chunks of learning,
+              our learning cycles.
+            </OakP>
+            <OakP $mb="space-between-s">
+              It encourages you to think about the prior knowledge that students
+              will require for the lesson, the vocabulary that will need to be
+              explicitly taught during the lesson, the key knowledge that you
+              want pupils to take from the lesson and the common misconceptions
+              or errors that pupils make in this topic.
+            </OakP>
+            <OakP $mb="space-between-s">
+              Our learning cycles are designed to ensure clear explanations - we
+              provide image and slide text suggestions to allow for dual coding,
+              we&apos;ve ensured slide design minimises extraneous cognitive
+              load for students and built-in regular checks for understanding
+              tasks followed by lots of practice for students.
+            </OakP>
+            <OakP $mb="space-between-s">
+              The process is designed to be flexible. You can tweak and change
+              the lesson as it is being created to suit the needs of your
+              pupils, as you know them best! The beauty of Aila is that it
+              won&apos;t produce your generic off-the-shelf lesson; it will help
+              you craft a lesson that is accessible and appropriate for your
+              students.
+            </OakP>
+            <OakP $mb="space-between-s">
+              Aila uses a technique called retrieval augmented generation (RAG)
+              to incorporate the high-quality Oak content, which has been
+              carefully and expertly created by real-life teachers and
+              quality-checked by subject experts. This should improve the
+              accuracy of the lessons being produced. Aila has been designed for
+              UK teachers so you are less likely to see Americanisms and the
+              content will be more closely aligned with the English national
+              curriculum.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Why has Oak created Aila when other AI assistants are already
+              available?
+            </OakHeading>
+            <OakP>
+              Aila draws on existing Oak content, which has been carefully and
+              expertly created by real-life teachers and quality-checked by
+              subject experts. Aila has been designed around the Oak{" "}
+              <OakLink href="https://www.thenational.academy/blog/our-approach-to-curriculum">
+                curriculum principles
+              </OakLink>
+              , which are national curriculum aligned and geared towards UK
+              users. With Aila, you&apos;re less likely to see Americanisms, and
+              the content will align much more closely with the requirements of
+              teachers in England.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              What are the limitations of Aila&apos;s features?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              We know that images are really important to support explanations
+              and Aila doesn&apos;t currently produce images or diagrams. Image
+              production is a feature that will come with a future iteration of
+              Aila, but to help teachers with this aspect of lesson design, we
+              currently provide an &apos;image suggestion&apos; to help you find
+              an appropriate image with Google.
+            </OakP>
+
+            <OakP $mb="space-between-s">
+              We are aware that complex concepts may require more than one slide
+              to support their explanation. We are developing this feature but
+              think this is the part of a lesson that will need the most
+              development from a teacher after export.
+            </OakP>
+
+            <OakP $mb="space-between-s">
+              Large Language Models are not as good at producing high-quality
+              content for some subjects and this is a limitation of Aila. We
+              know that the output isn&apos;t as good in certain subjects yet,
+              in particular STEM subjects and modern foreign languages. We are
+              actively working to improve these subjects.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Why does Aila only output in Oak format?
+            </OakHeading>
+            <OakP>
+              When designing Aila, we wanted pedagogical rigour to be at its
+              core. Oak&apos;s lesson design is underpinned by research in
+              learning and cognitive science, which has formed the structure of
+              the lessons that Aila produces. All outputs are fully editable, so
+              you can update them to your preferred formats.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Why is there only one type of questioning in the quizzes?
+            </OakHeading>
+            <OakP>
+              Multiple-choice questions are a really effective way of quickly
+              assessing pupils&apos; mastery of content, but they take a really
+              long time to write, so we have included lots to save you time.
+              After export, you can edit these to remove the options and make
+              them short answer questions or even add additional question types
+              to your slides.
+            </OakP>
+            <OakP $mb="space-between-xs">
+              Aila is still very much in development and we&apos;re aiming to
+              add more question types in future.
+            </OakP>
+          </div>
+
+          <div ref={supportRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Support and assistance
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Is support available if I encounter any issues or have questions?
+            </OakHeading>
+
+            <OakP $mb="space-between-s">
+              Yes, we provide comprehensive support to assist with any issues or
+              questions users may have. You can contact us via{" "}
+              <OakLink href="mailto:help@thenational.academy">email.</OakLink>
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Can I provide feedback or suggest improvements for Aila?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Yes, please do! We love to hear how users are finding our
+              resources and how we can improve them. Submit your{" "}
+              <OakLink href="https://docs.google.com/forms/d/e/1FAIpQLSf2AWtTtr4JISeMV4BY5LCMYhDFPz0RPNdXzmy_vjk4BmM69Q/viewform">
+                feedback or suggestions{" "}
+              </OakLink>
+              .
+            </OakP>
+
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Are there resources available for troubleshooting common problems?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              The more feedback we receive from users, the more we can identify
+              common problems and provide troubleshooting tips.
+            </OakP>
+          </div>
+
+          <div ref={accessibilityRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Accessibility
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Are there features in place to support diverse learners and
+              educators?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              We want as many people as possible to be able to use Aila. You
+              should be able to; change colours, contrast levels, and fonts;
+              read and use most of the website while zoomed in up to 400%;
+              navigate most of the website using just a keyboard; navigate most
+              of the website using speech recognition software; listen to most
+              of the website using a screen reader (including the most recent
+              versions of JAWS, NVDA, and VoiceOver). View our{" "}
+              <OakLink href="https://labs.thenational.academy/legal/accessibility-statement">
+                full accessibility statement
+              </OakLink>
+              .
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Can lesson plans be adapted for students with SEND?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Of course! You can prompt Aila to factor in your pupils&apos;
+              needs when generating your lesson plan. Try asking Aila to produce
+              texts of different reading ages, sentence starters, or alternative
+              activities to support pupils during the additional materials
+              section of the lesson. You are also able to download and edit all
+              resources after you have created your lesson.
+            </OakP>
+          </div>
+
+          <div ref={usageRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Usage and best practices
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              What are some best practices for maximising the effectiveness of
+              Aila?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Work with Aila to co-create your lesson. Before you proceed to the
+              next steps of co-creating your lesson with Aila, it is important
+              to check that you are happy with your lesson outcomes and learning
+              cycle outcomes, as this will determine the content for the rest of
+              the lesson.
+            </OakP>
+            <OakP $mb="space-between-s">
+              If you want the content to be adapted for a specific geographical
+              context, reading age or a specific pupil need, tell Aila at the
+              start so that that is taken into consideration when designing the
+              lesson content.
+            </OakP>
+            <OakP $mb="space-between-s">
+              The additional materials section of the lesson is the most
+              flexible. If you would like teacher instructions for a practical
+              lesson, model answers, essay-style questions, narratives for your
+              explanations or texts differentiated by reading age for your
+              classes, just ask at the end of the lesson planning process and
+              Aila will create these for you.
+            </OakP>
+          </div>
+
+          <div ref={technicalRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Technical
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              How does Aila work?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Aila is built to use Chat GPT4, but we are also evaluating other
+              models. We have written a 9,000-word prompt that provides very
+              specific guidance on what excellence looks like for each section
+              of a lesson.
+            </OakP>
+            <OakP $mb="space-between-s">
+              Aila also uses retrieval augmented generation (RAG) to integrate
+              the high-quality content of Oak&apos;s human-planned lessons into
+              the lessons being delivered. This means that the accuracy of the
+              content produced should be closely aligned with the needs of
+              teachers in England.
+            </OakP>
+          </div>
+
+          <div ref={updatesRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Updates and enhancements
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Are there plans for future enhancements or new features?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Yes, we strive to constantly improve our resources, taking into
+              account feedback from our users - Aila is still very much in
+              development. We aim to release future iterations of Aila that
+              produce images and diagrams. We are also developing Aila to ensure
+              that it has pedagogical rigour for a range of different subjects.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Can users suggest features for future updates?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Of course, we would love to hear your thoughts and suggestions for
+              other features that would support your teaching. Please{" "}
+              <OakLink href="https://docs.google.com/forms/d/e/1FAIpQLSf2AWtTtr4JISeMV4BY5LCMYhDFPz0RPNdXzmy_vjk4BmM69Q/viewform">
+                give us your feedback!
+              </OakLink>
+            </OakP>
+
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              How often are updates released for Aila?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              We&apos;re still in the beta phase, which means that whilst
+              we&apos;re allowing teachers to use it, it&apos;s still prone to
+              bugs and errors, and is still under constant development.
+              We&apos;re constantly receiving feedback and aim to improve and
+              iterate on an almost daily basis!
+            </OakP>
+
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              How will Aila be evaluated?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              The team at Oak constantly evaluates Aila, and we are designing
+              multiple approaches to this. We carry out consistency checks and
+              ensure that it follows the instructions we have built into the
+              prompt, and evaluate the quality of content being produced.
+            </OakP>
+            <OakP $mb="space-between-s">
+              We aim to evaluate several factors, such as Americanisms, cultural
+              biases, the appropriateness of the literacy level, checking that
+              the learning cycles increase in difficulty, and more.
+            </OakP>
+            <OakP $mb="space-between-s">
+              Nonetheless, generative AI will make mistakes, and the outputs
+              should be checked carefully.
+            </OakP>
+          </div>
+
+          <div ref={concernsRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Other concerns
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Is Oak trying to replace teachers with AI?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Absolutely not! At Oak, we share the brilliance of teachers from
+              across the country through our resources, and our Aila is no
+              different. It is designed to keep teachers in the driving seat,
+              with support from AI to reduce their workload.
+            </OakP>
+          </div>
+
+          <div ref={dataRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Data privacy and security
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Is Aila safe to use?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Generative AI will make mistakes, and no two outputs are the same.
+              With that in mind, it&apos;s important to check any AI-generated
+              content thoroughly before using it in the classroom. We have put
+              in place a number of technical and policy measures to minimise the
+              risks that generative AI presents but care should still be taken,
+              for example, you must not input personally identifiable
+              information into Aila, and this is in breach of the terms and
+              conditions of use.
+            </OakP>
+
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Can I have unlimited use?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              In order to prevent misuse, we&apos;ve restricted and protected
+              the volume of requests that can be made, lessons, and resources
+              that can be generated. If you&apos;re reaching these limits,
+              we&apos;d love to hear from you, and you can{" "}
+              <OakLink href="https://share.hsforms.com/118hyngR-QSS0J7vZEVlRSgbvumd">
+                request a higher limit.
+              </OakLink>
+            </OakP>
+
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              What ethical measures are you putting in place?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              Generative AI is a new and cutting-edge technology, and it&apos;s
+              important that anyone developing AI products actively takes into
+              account privacy, security and ethical considerations. We have
+              looked into emerging guidance and governance on generative AI,
+              including;
+            </OakP>
+            <OakUL className="mb-6 list-disc pl-12">
+              <OakLI $pv="inner-padding-xs">
+                UNESCO&apos;s core principles on{" "}
+                <OakLink href="https://www.unesco.org/en/artificial-intelligence/recommendation-ethics">
+                  a human-rights centred approach to the Ethics of AI
                 </OakLink>
               </OakLI>
-              <OakLI $pv="inner-padding-ssx">
-                <OakLink onClick={() => scrollToRefWithOffset(supportRef)}>
-                  Support and assistance
+              <OakLI $pv="inner-padding-xs">
+                US office for Edtech;{" "}
+                <OakLink href="https://tech.ed.gov/ai/">
+                  Artificial Intelligence and the Future of Teaching and
+                  Learning
                 </OakLink>
               </OakLI>
-              <OakLI $pv="inner-padding-ssx">
-                <OakLink
-                  onClick={() => scrollToRefWithOffset(accessibilityRef)}
-                >
-                  Accessibility
+              <OakLI $pv="inner-padding-xs">
+                UK DfE position on{" "}
+                <OakLink href="https://www.gov.uk/government/publications/generative-artificial-intelligence-in-education/generative-artificial-intelligence-ai-in-education">
+                  Generative artificial intelligence (AI) in education
                 </OakLink>
               </OakLI>
-              <OakLI $pv="inner-padding-ssx">
-                <OakLink onClick={() => scrollToRefWithOffset(usageRef)}>
-                  Usage and best practices
-                </OakLink>
+            </OakUL>
+            <OakP $mb="space-between-s">Aila is designed to:</OakP>
+            <OakUL className="mb-6 list-disc pl-12">
+              <OakLI $pv="inner-padding-xs">
+                <OakP>
+                  keep the human in the loop, informing and involving expert
+                  teachers and educators in the process
+                </OakP>
               </OakLI>
               <OakLI $pv="inner-padding-xs">
-                <OakLink onClick={() => scrollToRefWithOffset(technicalRef)}>
-                  Technical
-                </OakLink>
+                <OakP>
+                  not involve the input of personal information to LLMs
+                </OakP>
               </OakLI>
               <OakLI $pv="inner-padding-xs">
-                <OakLink onClick={() => scrollToRefWithOffset(updatesRef)}>
-                  Updates and enhancements
-                </OakLink>
+                <OakP>
+                  allow us to evaluate cultural biases that may be present in
+                  the generated content
+                </OakP>
               </OakLI>
               <OakLI $pv="inner-padding-xs">
-                <OakLink onClick={() => scrollToRefWithOffset(concernsRef)}>
-                  Other concerns
-                </OakLink>
+                <OakP>
+                  create guardrails around the generative AI to improve
+                  pedagogical alignment
+                </OakP>
               </OakLI>
               <OakLI $pv="inner-padding-xs">
-                <OakLink onClick={() => scrollToRefWithOffset(dataRef)}>
-                  Data privacy and security
-                </OakLink>
+                <OakP>
+                  be transparent and explainable to users; we openly share the
+                  underlying prompts
+                </OakP>
               </OakLI>
             </OakUL>
-          </OakBox>
-
-          <OakBoxCustomMaxWidth customMaxWidth={850}>
-            <div className="mb-20">
-              <GetInTouchBox />
-            </div>
-
-            <div ref={startingRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Getting started
-              </OakHeading>
-            </div>
-
-            <div className="mb-4">
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                How do I sign up for Aila?
-              </OakHeading>
-              <OakP>
-                You can sign up to access Aila and our other AI experiments{" "}
-                <OakLink href="/aila">here</OakLink>.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                How much does it cost to use Aila?
-              </OakHeading>
-              <OakP>
-                As with all of Oak&apos;s resources, Aila is completely free to
-                use. There are some fair use limits that we have applied that
-                you may reach if your use appears to be excessive.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                What are the system requirements for using Aila?
-              </OakHeading>
-              <OakP>
-                We aim to make our resources as accessible as possible. Aila
-                will be available to any teacher with access to a laptop or
-                computer and the Internet. We currently don&apos;t support
-                mobile usage.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                What is a beta product?
-              </OakHeading>
-              <OakP>
-                Aila is in the beta phase, and we are still actively testing and
-                developing Aila. This phase helps identify issues by allowing
-                teachers to use the Aila in real-life conditions. Aila is not
-                perfect, and will make some mistakes!{" "}
-                <OakLink href="https://docs.google.com/forms/d/e/1FAIpQLSf2AWtTtr4JISeMV4BY5LCMYhDFPz0RPNdXzmy_vjk4BmM69Q/viewform">
-                  Your feedback is essential
-                </OakLink>{" "}
-                to refine and improve Aila.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-m"
-                $mb="space-between-l"
-              >
-                Is there a tutorial or guide available to help me get started?
-              </OakHeading>
-              <OakP>
-                Aila provides helpful tips and prompts for getting started. If
-                you need additional support, you can take a look at our{" "}
-                <OakLink href="https://labs.thenational.academy/aila/help">
-                  help
-                </OakLink>{" "}
-                section, or contact us.
-              </OakP>
-            </div>
-
-            <div ref={featuresRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Features and functionality
-              </OakHeading>
-            </div>
-
-            <div className="mb-4">
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                What features does Aila offer?
-              </OakHeading>
-              <OakP>
-                Aila offers a range of features to help teachers create
-                high-quality lesson plans and resources. It is designed to
-                ensure that lesson plans meet national curriculum standards. You
-                can edit your lesson plan using Aila, quickly generating
-                downloadable lesson plans, editable slide decks, and starter and
-                exit quizzes. You may also choose to adapt or add to the
-                resources after download.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Can I customise lessons?
-              </OakHeading>
-              <OakP>
-                Yes! Aila is designed to guide you through the process of
-                co-creating a lesson. The more you specify to Aila, the better
-                your lesson will be. You can ask Aila to adapt the lesson to
-                suit your geographical context, the reading age of students in
-                your class, or any other additional needs your pupils may have.
-                The materials you produce with Aila are also fully editable.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                What are the advantages of using Aila?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Aila has been based upon Oak&apos;s{" "}
-                <OakLink href="https://www.thenational.academy/blog/our-approach-to-curriculum">
-                  curriculum principles
-                </OakLink>{" "}
-                Aila is designed to take you through the process that an expert
-                teacher would use to plan a lesson; starting with your lesson
-                outcome and breaking that down into manageable chunks of
-                learning, our learning cycles.
-              </OakP>
-              <OakP $mb="space-between-s">
-                It encourages you to think about the prior knowledge that
-                students will require for the lesson, the vocabulary that will
-                need to be explicitly taught during the lesson, the key
-                knowledge that you want pupils to take from the lesson and the
-                common misconceptions or errors that pupils make in this topic.
-              </OakP>
-              <OakP $mb="space-between-s">
-                Our learning cycles are designed to ensure clear explanations -
-                we provide image and slide text suggestions to allow for dual
-                coding, we&apos;ve ensured slide design minimises extraneous
-                cognitive load for students and built-in regular checks for
-                understanding tasks followed by lots of practice for students.
-              </OakP>
-              <OakP $mb="space-between-s">
-                The process is designed to be flexible. You can tweak and change
-                the lesson as it is being created to suit the needs of your
-                pupils, as you know them best! The beauty of Aila is that it
-                won&apos;t produce your generic off-the-shelf lesson; it will
-                help you craft a lesson that is accessible and appropriate for
-                your students.
-              </OakP>
-              <OakP $mb="space-between-s">
-                Aila uses a technique called retrieval augmented generation
-                (RAG) to incorporate the high-quality Oak content, which has
-                been carefully and expertly created by real-life teachers and
-                quality-checked by subject experts. This should improve the
-                accuracy of the lessons being produced. Aila has been designed
-                for UK teachers so you are less likely to see Americanisms and
-                the content will be more closely aligned with the English
-                national curriculum.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Why has Oak created Aila when other AI assistants are already
-                available?
-              </OakHeading>
-              <OakP>
-                Aila draws on existing Oak content, which has been carefully and
-                expertly created by real-life teachers and quality-checked by
-                subject experts. Aila has been designed around the Oak{" "}
-                <OakLink href="https://www.thenational.academy/blog/our-approach-to-curriculum">
-                  curriculum principles
-                </OakLink>
-                , which are national curriculum aligned and geared towards UK
-                users. With Aila, you&apos;re less likely to see Americanisms,
-                and the content will align much more closely with the
-                requirements of teachers in England.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                What are the limitations of Aila&apos;s features?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                We know that images are really important to support explanations
-                and Aila doesn&apos;t currently produce images or diagrams.
-                Image production is a feature that will come with a future
-                iteration of Aila, but to help teachers with this aspect of
-                lesson design, we currently provide an &apos;image
-                suggestion&apos; to help you find an appropriate image with
-                Google.
-              </OakP>
-
-              <OakP $mb="space-between-s">
-                We are aware that complex concepts may require more than one
-                slide to support their explanation. We are developing this
-                feature but think this is the part of a lesson that will need
-                the most development from a teacher after export.
-              </OakP>
-
-              <OakP $mb="space-between-s">
-                Large Language Models are not as good at producing high-quality
-                content for some subjects and this is a limitation of Aila. We
-                know that the output isn&apos;t as good in certain subjects yet,
-                in particular STEM subjects and modern foreign languages. We are
-                actively working to improve these subjects.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Why does Aila only output in Oak format?
-              </OakHeading>
-              <OakP>
-                When designing Aila, we wanted pedagogical rigour to be at its
-                core. Oak&apos;s lesson design is underpinned by research in
-                learning and cognitive science, which has formed the structure
-                of the lessons that Aila produces. All outputs are fully
-                editable, so you can update them to your preferred formats.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Why is there only one type of questioning in the quizzes?
-              </OakHeading>
-              <OakP>
-                Multiple-choice questions are a really effective way of quickly
-                assessing pupils&apos; mastery of content, but they take a
-                really long time to write, so we have included lots to save you
-                time. After export, you can edit these to remove the options and
-                make them short answer questions or even add additional question
-                types to your slides.
-              </OakP>
-              <OakP $mb="space-between-xs">
-                Aila is still very much in development and we&apos;re aiming to
-                add more question types in future.
-              </OakP>
-            </div>
-
-            <div ref={supportRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Support and assistance
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Is support available if I encounter any issues or have
-                questions?
-              </OakHeading>
-
-              <OakP $mb="space-between-s">
-                Yes, we provide comprehensive support to assist with any issues
-                or questions users may have. You can contact us via{" "}
-                <OakLink href="mailto:help@thenational.academy">email.</OakLink>
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Can I provide feedback or suggest improvements for Aila?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Yes, please do! We love to hear how users are finding our
-                resources and how we can improve them. Submit your{" "}
-                <OakLink href="https://docs.google.com/forms/d/e/1FAIpQLSf2AWtTtr4JISeMV4BY5LCMYhDFPz0RPNdXzmy_vjk4BmM69Q/viewform">
-                  feedback or suggestions{" "}
-                </OakLink>
-                .
-              </OakP>
-
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Are there resources available for troubleshooting common
-                problems?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                The more feedback we receive from users, the more we can
-                identify common problems and provide troubleshooting tips.
-              </OakP>
-            </div>
-
-            <div ref={accessibilityRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Accessibility
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Are there features in place to support diverse learners and
-                educators?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                We want as many people as possible to be able to use Aila. You
-                should be able to; change colours, contrast levels, and fonts;
-                read and use most of the website while zoomed in up to 400%;
-                navigate most of the website using just a keyboard; navigate
-                most of the website using speech recognition software; listen to
-                most of the website using a screen reader (including the most
-                recent versions of JAWS, NVDA, and VoiceOver). View our{" "}
-                <OakLink href="https://labs.thenational.academy/legal/accessibility-statement">
-                  full accessibility statement
-                </OakLink>
-                .
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Can lesson plans be adapted for students with SEND?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Of course! You can prompt Aila to factor in your pupils&apos;
-                needs when generating your lesson plan. Try asking Aila to
-                produce texts of different reading ages, sentence starters, or
-                alternative activities to support pupils during the additional
-                materials section of the lesson. You are also able to download
-                and edit all resources after you have created your lesson.
-              </OakP>
-            </div>
-
-            <div ref={usageRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Usage and best practices
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                What are some best practices for maximising the effectiveness of
-                Aila?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Work with Aila to co-create your lesson. Before you proceed to
-                the next steps of co-creating your lesson with Aila, it is
-                important to check that you are happy with your lesson outcomes
-                and learning cycle outcomes, as this will determine the content
-                for the rest of the lesson.
-              </OakP>
-              <OakP $mb="space-between-s">
-                If you want the content to be adapted for a specific
-                geographical context, reading age or a specific pupil need, tell
-                Aila at the start so that that is taken into consideration when
-                designing the lesson content.
-              </OakP>
-              <OakP $mb="space-between-s">
-                The additional materials section of the lesson is the most
-                flexible. If you would like teacher instructions for a practical
-                lesson, model answers, essay-style questions, narratives for
-                your explanations or texts differentiated by reading age for
-                your classes, just ask at the end of the lesson planning process
-                and Aila will create these for you.
-              </OakP>
-            </div>
-
-            <div ref={technicalRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Technical
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                How does Aila work?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Aila is built to use Chat GPT4, but we are also evaluating other
-                models. We have written a 9,000-word prompt that provides very
-                specific guidance on what excellence looks like for each section
-                of a lesson.
-              </OakP>
-              <OakP $mb="space-between-s">
-                Aila also uses retrieval augmented generation (RAG) to integrate
-                the high-quality content of Oak&apos;s human-planned lessons
-                into the lessons being delivered. This means that the accuracy
-                of the content produced should be closely aligned with the needs
-                of teachers in England.
-              </OakP>
-            </div>
-
-            <div ref={updatesRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Updates and enhancements
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Are there plans for future enhancements or new features?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Yes, we strive to constantly improve our resources, taking into
-                account feedback from our users - Aila is still very much in
-                development. We aim to release future iterations of Aila that
-                produce images and diagrams. We are also developing Aila to
-                ensure that it has pedagogical rigour for a range of different
-                subjects.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Can users suggest features for future updates?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Of course, we would love to hear your thoughts and suggestions
-                for other features that would support your teaching. Please{" "}
-                <OakLink href="https://docs.google.com/forms/d/e/1FAIpQLSf2AWtTtr4JISeMV4BY5LCMYhDFPz0RPNdXzmy_vjk4BmM69Q/viewform">
-                  give us your feedback!
-                </OakLink>
-              </OakP>
-
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                How often are updates released for Aila?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                We&apos;re still in the beta phase, which means that whilst
-                we&apos;re allowing teachers to use it, it&apos;s still prone to
-                bugs and errors, and is still under constant development.
-                We&apos;re constantly receiving feedback and aim to improve and
-                iterate on an almost daily basis!
-              </OakP>
-
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                How will Aila be evaluated?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                The team at Oak constantly evaluates Aila, and we are designing
-                multiple approaches to this. We carry out consistency checks and
-                ensure that it follows the instructions we have built into the
-                prompt, and evaluate the quality of content being produced.
-              </OakP>
-              <OakP $mb="space-between-s">
-                We aim to evaluate several factors, such as Americanisms,
-                cultural biases, the appropriateness of the literacy level,
-                checking that the learning cycles increase in difficulty, and
-                more.
-              </OakP>
-              <OakP $mb="space-between-s">
-                Nonetheless, generative AI will make mistakes, and the outputs
-                should be checked carefully.
-              </OakP>
-            </div>
-
-            <div ref={concernsRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Other concerns
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Is Oak trying to replace teachers with AI?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Absolutely not! At Oak, we share the brilliance of teachers from
-                across the country through our resources, and our Aila is no
-                different. It is designed to keep teachers in the driving seat,
-                with support from AI to reduce their workload.
-              </OakP>
-            </div>
-
-            <div ref={dataRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Data privacy and security
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Is Aila safe to use?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Generative AI will make mistakes, and no two outputs are the
-                same. With that in mind, it&apos;s important to check any
-                AI-generated content thoroughly before using it in the
-                classroom. We have put in place a number of technical and policy
-                measures to minimise the risks that generative AI presents but
-                care should still be taken, for example, you must not input
-                personally identifiable information into Aila, and this is in
-                breach of the terms and conditions of use.
-              </OakP>
-
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Can I have unlimited use?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                In order to prevent misuse, we&apos;ve restricted and protected
-                the volume of requests that can be made, lessons, and resources
-                that can be generated. If you&apos;re reaching these limits,
-                we&apos;d love to hear from you, and you can{" "}
-                <OakLink href="https://share.hsforms.com/118hyngR-QSS0J7vZEVlRSgbvumd">
-                  request a higher limit.
-                </OakLink>
-              </OakP>
-
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                What ethical measures are you putting in place?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                Generative AI is a new and cutting-edge technology, and
-                it&apos;s important that anyone developing AI products actively
-                takes into account privacy, security and ethical considerations.
-                We have looked into emerging guidance and governance on
-                generative AI, including;
-              </OakP>
-              <OakUL className="mb-6 list-disc pl-12">
-                <OakLI $pv="inner-padding-xs">
-                  UNESCO&apos;s core principles on{" "}
-                  <OakLink href="https://www.unesco.org/en/artificial-intelligence/recommendation-ethics">
-                    a human-rights centred approach to the Ethics of AI
-                  </OakLink>
-                </OakLI>
-                <OakLI $pv="inner-padding-xs">
-                  US office for Edtech;{" "}
-                  <OakLink href="https://tech.ed.gov/ai/">
-                    Artificial Intelligence and the Future of Teaching and
-                    Learning
-                  </OakLink>
-                </OakLI>
-                <OakLI $pv="inner-padding-xs">
-                  UK DfE position on{" "}
-                  <OakLink href="https://www.gov.uk/government/publications/generative-artificial-intelligence-in-education/generative-artificial-intelligence-ai-in-education">
-                    Generative artificial intelligence (AI) in education
-                  </OakLink>
-                </OakLI>
-              </OakUL>
-              <OakP $mb="space-between-s">Aila is designed to:</OakP>
-              <OakUL className="mb-6 list-disc pl-12">
-                <OakLI $pv="inner-padding-xs">
-                  <OakP>
-                    keep the human in the loop, informing and involving expert
-                    teachers and educators in the process
-                  </OakP>
-                </OakLI>
-                <OakLI $pv="inner-padding-xs">
-                  <OakP>
-                    not involve the input of personal information to LLMs
-                  </OakP>
-                </OakLI>
-                <OakLI $pv="inner-padding-xs">
-                  <OakP>
-                    allow us to evaluate cultural biases that may be present in
-                    the generated content
-                  </OakP>
-                </OakLI>
-                <OakLI $pv="inner-padding-xs">
-                  <OakP>
-                    create guardrails around the generative AI to improve
-                    pedagogical alignment
-                  </OakP>
-                </OakLI>
-                <OakLI $pv="inner-padding-xs">
-                  <OakP>
-                    be transparent and explainable to users; we openly share the
-                    underlying prompts
-                  </OakP>
-                </OakLI>
-              </OakUL>
-            </div>
-
-            <div ref={concernsRef}>
-              <OakHeading
-                tag="h2"
-                $font="heading-5"
-                $mt="space-between-xxl"
-                $mb="space-between-s"
-              >
-                Aila
-              </OakHeading>
-            </div>
-
-            <div>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Why did you decide to name Oak&apos;s AI lesson assistant, Aila?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                The name is an acronym for &apos;AI lesson assistant&apos;. We
-                wanted the name to have &apos;AI&apos; in it, as our research
-                found that teachers would be more likely to use an AI product if
-                it was clear that it was AI-powered and could save them time.
-                Further research into the name led to some deeper connections
-                which helped to solidify our decision. &apos;Aila&apos; means
-                &apos;oak tree&apos; in Hebrew, and in Scottish Gaelic, Aila
-                means &apos;from the strong place&apos;. We believe the rigour
-                and quality of Aila stems from the strong foundation provided by
-                both Oak&apos;s strong curriculum principles and the
-                high-quality, teacher-generated content that we have been able
-                to integrate into the lesson development process.
-              </OakP>
-              <OakHeading
-                tag="h3"
-                $font="body-1-bold"
-                $mt="space-between-l"
-                $mb="space-between-s"
-              >
-                Why did you give it a human name?
-              </OakHeading>
-              <OakP $mb="space-between-s">
-                In Aila&apos;s initial testing phases, users reported being
-                unsure of how to &apos;talk&apos; to the assistant. Giving it a
-                name humanises the chatbot and encourages more natural
-                conversation.
-              </OakP>
-            </div>
-          </OakBoxCustomMaxWidth>
-        </OakFlex>
-      </OakMaxWidth>
-    </>
+          </div>
+
+          <div ref={concernsRef}>
+            <OakHeading
+              tag="h2"
+              $font="heading-5"
+              $mt="space-between-xxl"
+              $mb="space-between-s"
+            >
+              Aila
+            </OakHeading>
+          </div>
+
+          <div>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Why did you decide to name Oak&apos;s AI lesson assistant, Aila?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              The name is an acronym for &apos;AI lesson assistant&apos;. We
+              wanted the name to have &apos;AI&apos; in it, as our research
+              found that teachers would be more likely to use an AI product if
+              it was clear that it was AI-powered and could save them time.
+              Further research into the name led to some deeper connections
+              which helped to solidify our decision. &apos;Aila&apos; means
+              &apos;oak tree&apos; in Hebrew, and in Scottish Gaelic, Aila means
+              &apos;from the strong place&apos;. We believe the rigour and
+              quality of Aila stems from the strong foundation provided by both
+              Oak&apos;s strong curriculum principles and the high-quality,
+              teacher-generated content that we have been able to integrate into
+              the lesson development process.
+            </OakP>
+            <OakHeading
+              tag="h3"
+              $font="body-1-bold"
+              $mt="space-between-l"
+              $mb="space-between-s"
+            >
+              Why did you give it a human name?
+            </OakHeading>
+            <OakP $mb="space-between-s">
+              In Aila&apos;s initial testing phases, users reported being unsure
+              of how to &apos;talk&apos; to the assistant. Giving it a name
+              humanises the chatbot and encourages more natural conversation.
+            </OakP>
+          </div>
+        </OakBoxCustomMaxWidth>
+      </OakFlex>
+    </OakMaxWidth>
   );
 };
 
diff --git a/apps/nextjs/src/app/global-error.tsx b/apps/nextjs/src/app/global-error.tsx
index ce7e1baaa..4ac61f440 100644
--- a/apps/nextjs/src/app/global-error.tsx
+++ b/apps/nextjs/src/app/global-error.tsx
@@ -18,7 +18,7 @@ export default function GlobalError({
   }, [error]);
 
   return (
-    <html>
+    <html lang="en">
       <body>
         <FullPageWarning>
           <FullPageWarning.Icon icon="acorn" size="xl" />
diff --git a/apps/nextjs/src/app/home-page.stories.tsx b/apps/nextjs/src/app/home-page.stories.tsx
index e61e5eab1..f4db6a63e 100644
--- a/apps/nextjs/src/app/home-page.stories.tsx
+++ b/apps/nextjs/src/app/home-page.stories.tsx
@@ -1,14 +1,19 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
+import { chromaticParams } from "@/storybook/chromatic";
+
 import { HomePageContent } from "./home-page";
 
-const meta: Meta<typeof HomePageContent> = {
+const meta = {
   title: "Pages/Homepage",
   component: HomePageContent,
-};
+  parameters: {
+    ...chromaticParams(["mobile", "desktop"]),
+  },
+} satisfies Meta<typeof HomePageContent>;
 
 export default meta;
-type Story = StoryObj<typeof HomePageContent>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
diff --git a/apps/nextjs/src/app/legal/[slug]/legal.stories.tsx b/apps/nextjs/src/app/legal/[slug]/legal.stories.tsx
index 88a049b92..087a95fcf 100644
--- a/apps/nextjs/src/app/legal/[slug]/legal.stories.tsx
+++ b/apps/nextjs/src/app/legal/[slug]/legal.stories.tsx
@@ -1,14 +1,19 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
+import { chromaticParams } from "@/storybook/chromatic";
+
 import { LegalContent } from "./legal";
 
-const meta: Meta<typeof LegalContent> = {
+const meta = {
   title: "Pages/Legal/Sanity dynamic",
   component: LegalContent,
-};
+  parameters: {
+    ...chromaticParams(["mobile", "desktop"]),
+  },
+} satisfies Meta<typeof LegalContent>;
 
 export default meta;
-type Story = StoryObj<typeof LegalContent>;
+type Story = StoryObj<typeof meta>;
 
 const fixture = {
   pageData: {
diff --git a/apps/nextjs/src/app/legal/account-locked/account-locked.stories.tsx b/apps/nextjs/src/app/legal/account-locked/account-locked.stories.tsx
index 820cdd4e9..d3802b627 100644
--- a/apps/nextjs/src/app/legal/account-locked/account-locked.stories.tsx
+++ b/apps/nextjs/src/app/legal/account-locked/account-locked.stories.tsx
@@ -1,14 +1,19 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
+import { chromaticParams } from "@/storybook/chromatic";
+
 import { AccountLocked } from "./account-locked";
 
-const meta: Meta<typeof AccountLocked> = {
+const meta = {
   title: "Pages/Legal/Account Locked",
   component: AccountLocked,
-};
+  parameters: {
+    ...chromaticParams(["mobile", "desktop"]),
+  },
+} satisfies Meta<typeof AccountLocked>;
 
 export default meta;
-type Story = StoryObj<typeof AccountLocked>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
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 fcced6393..493eda990 100644
--- a/apps/nextjs/src/app/lesson-planner/preview/[slug]/page.tsx
+++ b/apps/nextjs/src/app/lesson-planner/preview/[slug]/page.tsx
@@ -16,8 +16,6 @@ async function getData(slug: string) {
       notFound: true,
     };
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  //   const { updatedAt, createdAt, ...rest } = sharedData;
 
   const planSections = sharedData.content;
   return planSections;
diff --git a/apps/nextjs/src/app/prompts/prompts.stories.tsx b/apps/nextjs/src/app/prompts/prompts.stories.tsx
index df2e3d10e..9fdb74c13 100644
--- a/apps/nextjs/src/app/prompts/prompts.stories.tsx
+++ b/apps/nextjs/src/app/prompts/prompts.stories.tsx
@@ -1,14 +1,19 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
+import { chromaticParams } from "@/storybook/chromatic";
+
 import { PromptsContent } from "./prompts";
 
-const meta: Meta<typeof PromptsContent> = {
+const meta = {
   title: "Pages/Prompts",
   component: PromptsContent,
-};
+  parameters: {
+    ...chromaticParams(["mobile", "desktop"]),
+  },
+} satisfies Meta<typeof PromptsContent>;
 
 export default meta;
-type Story = StoryObj<typeof PromptsContent>;
+type Story = StoryObj<typeof meta>;
 
 const fixture = {
   apps: [
diff --git a/apps/nextjs/src/app/prompts/prompts.tsx b/apps/nextjs/src/app/prompts/prompts.tsx
index c358e617f..dbefb5ebc 100644
--- a/apps/nextjs/src/app/prompts/prompts.tsx
+++ b/apps/nextjs/src/app/prompts/prompts.tsx
@@ -48,89 +48,87 @@ export const PromptsContent = ({ apps }: PromptsPageData) => {
   }, [pathname, itemRefs]);
 
   return (
-    <>
-      <OakMaxWidth>
-        <HeroContainer>
-          <OakBox>
-            <OakHeading tag="h1" $mb="space-between-s" $font="heading-2">
-              How does our AI work?
-            </OakHeading>
-            <OakP>
-              At Oak’s AI Experiments, we aim to test whether high quality
-              education content can be generated using existing Large Language
-              Models (LLMs). We are keen to make sure that our work is
-              transparent. All our code across Oak is open source, and the repo
-              for our AI tools can be found{" "}
-              <a
-                href="https://github.com/oaknational/oak-ai-lesson-assistant/tree/main/packages/aila/src/core/prompt"
-                target="_blank"
-              >
-                here
-              </a>
-              .
-            </OakP>
-          </OakBox>
-        </HeroContainer>
-        <OakBox $pv="inner-padding-s" $mt="space-between-xl">
-          <OakHeading $mb="space-between-s" tag="h2">
-            As an example, here is the prompt that we use for our quiz builder
-            tool:
+    <OakMaxWidth>
+      <HeroContainer>
+        <OakBox>
+          <OakHeading tag="h1" $mb="space-between-s" $font="heading-2">
+            How does our AI work?
           </OakHeading>
+          <OakP>
+            At Oak’s AI Experiments, we aim to test whether high quality
+            education content can be generated using existing Large Language
+            Models (LLMs). We are keen to make sure that our work is
+            transparent. All our code across Oak is open source, and the repo
+            for our AI tools can be found{" "}
+            <a
+              href="https://github.com/oaknational/oak-ai-lesson-assistant/tree/main/packages/aila/src/core/prompt"
+              target="_blank"
+            >
+              here
+            </a>
+            {"."}
+          </OakP>
+        </OakBox>
+      </HeroContainer>
+      <OakBox $pv="inner-padding-s" $mt="space-between-xl">
+        <OakHeading $mb="space-between-s" tag="h2">
+          As an example, here is the prompt that we use for our quiz builder
+          tool:
+        </OakHeading>
 
-          <OakUL>
-            {apps.map((app) => {
-              if (app.name !== "Lesson planner") {
-                return (
-                  <OakLI
-                    key={app.id}
-                    className="border-b border-black border-opacity-30 pb-14"
+        <OakUL>
+          {apps.map((app) => {
+            if (app.name !== "Lesson planner") {
+              return (
+                <OakLI
+                  key={app.id}
+                  className="border-b border-black border-opacity-30 pb-14"
+                >
+                  <OakHeading
+                    tag="h3"
+                    $font="body-1-bold"
+                    $mb="space-between-ssx"
+                    $mt="space-between-m"
                   >
-                    <OakHeading
-                      tag="h3"
-                      $font="body-1-bold"
-                      $mb="space-between-ssx"
-                      $mt="space-between-m"
-                    >
-                      <OakSpan $font="body-1">App:</OakSpan> {app.name}
-                    </OakHeading>
-                    <OakUL>
-                      {app.prompts.map((prompt) => {
-                        const promptRef = React.createRef<HTMLLIElement>();
-                        itemRefs[slugify(prompt.name)] = promptRef;
+                    <OakSpan $font="body-1">App:</OakSpan> {app.name}
+                  </OakHeading>
+                  <OakUL>
+                    {app.prompts.map((prompt) => {
+                      const promptRef = React.createRef<HTMLLIElement>();
+                      itemRefs[slugify(prompt.name)] = promptRef;
 
-                        return (
-                          <OakLI
-                            key={prompt.id}
-                            className="mt-20 delay-500 duration-500"
-                            id={slugify(prompt.name)}
-                            ref={promptRef}
+                      return (
+                        <OakLI
+                          key={prompt.id}
+                          className="mt-20 delay-500 duration-500"
+                          id={slugify(prompt.name)}
+                          ref={promptRef}
+                        >
+                          <OakHeading
+                            tag="h3"
+                            $font="heading-6"
+                            $mb="space-between-ssx"
                           >
-                            <OakHeading
-                              tag="h3"
-                              $font="heading-6"
-                              $mb="space-between-ssx"
-                            >
-                              {prompt.name}
-                            </OakHeading>
-                            <OakP className="font-mono text-sm font-bold">
-                              Prompt:
-                              <br />
-                            </OakP>
-                            <pre className="max-w-full whitespace-pre-wrap break-words">
-                              {prompt.template}
-                            </pre>
-                          </OakLI>
-                        );
-                      })}
-                    </OakUL>
-                  </OakLI>
-                );
-              }
-            })}
-          </OakUL>
-        </OakBox>
-      </OakMaxWidth>
-    </>
+                            {prompt.name}
+                          </OakHeading>
+                          <OakP className="font-mono text-sm font-bold">
+                            Prompt:
+                            <br />
+                          </OakP>
+                          <pre className="max-w-full whitespace-pre-wrap break-words">
+                            {prompt.template}
+                          </pre>
+                        </OakLI>
+                      );
+                    })}
+                  </OakUL>
+                </OakLI>
+              );
+            }
+          })}
+        </OakUL>
+      </OakBox>
+    </OakMaxWidth>
   );
 };
 
diff --git a/apps/nextjs/src/app/quiz-designer/preview/[slug]/page.tsx b/apps/nextjs/src/app/quiz-designer/preview/[slug]/page.tsx
index c8d9b3d05..9f9964907 100644
--- a/apps/nextjs/src/app/quiz-designer/preview/[slug]/page.tsx
+++ b/apps/nextjs/src/app/quiz-designer/preview/[slug]/page.tsx
@@ -14,8 +14,6 @@ async function getData(slug: string) {
       notFound: true,
     };
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  //   const { updatedAt, createdAt, ...rest } = sharedData;
 
   const questions = sharedData.content;
 
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 84aa6955e..93fb1b5b8 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
@@ -3,8 +3,8 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import { ChatModerationDisplay } from "./ChatModerationDisplay";
 
-const meta: Meta<typeof ChatModerationDisplay> = {
-  title: "Components/Chat/ChatModerationDisplay",
+const meta = {
+  title: "Components/Dialogs/ChatModerationDisplay",
   component: ChatModerationDisplay,
   tags: ["autodocs"],
   decorators: [
@@ -14,10 +14,10 @@ const meta: Meta<typeof ChatModerationDisplay> = {
       </div>
     ),
   ],
-};
+} satisfies Meta<typeof ChatModerationDisplay>;
 
 export default meta;
-type Story = StoryObj<typeof ChatModerationDisplay>;
+type Story = StoryObj<typeof meta>;
 
 const toxicModeration: PersistedModerationBase = {
   id: "mock-moderation-id",
diff --git a/apps/nextjs/src/components/AppComponents/Chat/Chat/chat.tsx b/apps/nextjs/src/components/AppComponents/Chat/Chat/chat.tsx
index 0626cf20a..0d5394fac 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/chat.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/chat.tsx
@@ -15,7 +15,7 @@ export interface ChatProps extends React.ComponentProps<"div"> {
 export function Chat({ className }: Readonly<ChatProps>) {
   const chatContext = useLessonChat();
   const { id, lessonPlan, messages, chat } = chatContext;
-  const isShared = chat?.isShared || false;
+  const isShared = chat?.isShared ?? false;
   return (
     <ChatModeration>
       <DialogRoot>
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 a3503b2c0..4f3786afd 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useProgressForDownloads.ts
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/hooks/useProgressForDownloads.ts
@@ -1,9 +1,26 @@
 import { useMemo } from "react";
 
-import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type {
+  LessonPlanKeys,
+  LooseLessonPlan,
+} from "@oakai/aila/src/protocol/schema";
 import { lessonPlanSectionsSchema } from "@oakai/exports/src/schema/input.schema";
 import type { ZodIssue } from "zod";
 
+export type ProgressForDownloads = {
+  sections: ProgressSection[];
+  totalSections: number;
+  totalSectionsComplete: number;
+};
+
+export type ProgressSection = {
+  label: string;
+  key: LessonPlanKeys;
+  complete: boolean;
+};
+
+export type ProgressSections = ProgressSection[];
+
 /**
  * For a given list of Zod issues and lessonPlan fields, checks that none of
  * the errors pertain to the fields.
@@ -16,16 +33,6 @@ function getCompleteness(errors: ZodIssue[], fields: string[]) {
 
   return !hasErrorInSomeField;
 }
-export type ProgressSections = {
-  label: string;
-  key: string;
-  complete: boolean;
-}[];
-type ProgressForDownloads = {
-  sections: ProgressSections;
-  totalSections: number;
-  totalSectionsComplete: number;
-};
 
 export function useProgressForDownloads({
   lessonPlan,
@@ -59,8 +66,9 @@ export function useProgressForDownloads({
            */
           return true;
         }
-      }) || [];
-    const sections = [
+      }) ?? [];
+
+    const sections: ProgressSection[] = [
       {
         label: "Lesson details",
         key: "title",
diff --git a/apps/nextjs/src/components/AppComponents/Chat/button-scroll-to-bottom.tsx b/apps/nextjs/src/components/AppComponents/Chat/button-scroll-to-bottom.tsx
deleted file mode 100644
index 5c9800993..000000000
--- a/apps/nextjs/src/components/AppComponents/Chat/button-scroll-to-bottom.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-"use client";
-
-import {
-  Button,
-  type ButtonProps,
-} from "@/components/AppComponents/Chat/ui/button";
-import { IconArrowDown } from "@/components/AppComponents/Chat/ui/icons";
-import useAnalytics from "@/lib/analytics/useAnalytics";
-import { useAtBottom } from "@/lib/hooks/use-at-bottom";
-import { cn } from "@/lib/utils";
-
-export function ButtonScrollToBottom({ className, ...props }: ButtonProps) {
-  const isAtBottom = useAtBottom();
-  const { trackEvent } = useAnalytics();
-  return (
-    <Button
-      variant="outline"
-      size="icon"
-      className={cn(
-        "absolute right-10 top-5 z-10 bg-background transition-opacity duration-300 sm:right-18 md:top-7",
-        isAtBottom ? "opacity-0" : "opacity-100",
-        className,
-      )}
-      onClick={() => {
-        trackEvent("chat:scroll_to_bottom");
-        window.scrollTo({
-          top: document.body.offsetHeight,
-          behavior: "smooth",
-        });
-      }}
-      {...props}
-    >
-      <IconArrowDown />
-      <span className="sr-only">Scroll to bottom</span>
-    </Button>
-  );
-}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-history.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-history.stories.tsx
index d5ccab452..58ae81767 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-history.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-history.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import { ChatHistory } from "./chat-history";
 
-const meta: Meta<typeof ChatHistory> = {
+const meta = {
   title: "Components/Sidebar/ChatHistory",
   component: ChatHistory,
   parameters: {
@@ -17,10 +17,10 @@ const meta: Meta<typeof ChatHistory> = {
       </Dialog.Root>
     ),
   ],
-};
+} satisfies Meta<typeof ChatHistory>;
 
 export default meta;
-type Story = StoryObj<typeof ChatHistory>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-history.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-history.tsx
index 6944600c8..f1bf0d168 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-history.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-history.tsx
@@ -80,7 +80,7 @@ export function ChatHistory() {
           <ChatButton href="/" variant="text-link">
             <span className="scale-90">
               <OakIcon iconName="home" />
-            </span>
+            </span>{" "}
             AI experiments page
           </ChatButton>
           <ChatButton
@@ -89,7 +89,7 @@ export function ChatHistory() {
           >
             <span className="scale-90">
               <OakIcon iconName="question-mark" />
-            </span>
+            </span>{" "}
             Help
           </ChatButton>
         </div>
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 ba3fab32e..6a4e25561 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
@@ -26,7 +26,7 @@ const ChatLeftHandSide = ({
   demo,
   isDemoUser,
 }: Readonly<ChatLeftHandSideProps>) => {
-  const { messages, chatAreaRef } = useLessonChat();
+  const { chatAreaRef } = useLessonChat();
   return (
     <Flex
       direction="column"
@@ -39,6 +39,7 @@ const ChatLeftHandSide = ({
         setShowLessonMobile={setShowLessonMobile}
         showLessonMobile={showLessonMobile}
         isDemoUser={isDemoUser}
+        showStreamingStatus={process.env.NEXT_PUBLIC_ENVIRONMENT !== "prd"}
       />
       <div>
         <ChatPanelArea chatAreaRef={chatAreaRef} isDemoLocked={isDemoLocked}>
@@ -48,14 +49,9 @@ const ChatLeftHandSide = ({
             demo={demo}
           />
         </ChatPanelArea>
-        {!isDemoLocked && (
-          <QuickActionButtons isEmptyScreen={!!messages.length} />
-        )}
+        {!isDemoLocked && <QuickActionButtons />}
       </div>
-      <ChatPanel
-        isEmptyScreen={!!messages.length}
-        isDemoLocked={isDemoLocked}
-      />
+      <ChatPanel isDemoLocked={isDemoLocked} />
       <span className="absolute right-0 top-[-70px] z-10 hidden h-[calc(100vh+100px)] w-3 bg-black sm:block" />
     </Flex>
   );
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.stories.tsx
index 6400caf3a..7cff21bc8 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.stories.tsx
@@ -1,53 +1,47 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
 import type { ChatContextProps } from "@/components/ContextProviders/ChatProvider";
-import { ChatContext } from "@/components/ContextProviders/ChatProvider";
+import { ChatDecorator } from "@/storybook/decorators/ChatDecorator";
 
 import LessonPlanDisplay from "./chat-lessonPlanDisplay";
 
-const ChatDecorator: Story["decorators"] = (Story, { parameters }) => (
-  <ChatContext.Provider
-    value={
-      {
-        id: "123",
-        lastModeration: null,
-        messages: [],
-        lessonPlan: {
-          title: "About Frogs",
-          keyStage: "Key Stage 2",
-          subject: "Science",
-          topic: "Amphibians",
-          basedOn: "Frogs in Modern Britain",
-          learningOutcome:
-            "To understand the importance of frogs in British society and culture",
-        },
-        ailaStreamingStatus: "Idle",
-        ...parameters.chatContext,
-      } as unknown as ChatContextProps
-    }
-  >
-    <Story />
-  </ChatContext.Provider>
-);
+const chatContext: Partial<ChatContextProps> = {
+  id: "123",
+  lastModeration: null,
+  messages: [],
+  lessonPlan: {
+    title: "About Frogs",
+    keyStage: "Key Stage 2",
+    subject: "Science",
+    topic: "Amphibians",
+    basedOn: { title: "Frogs in Modern Britain" },
+    learningOutcome:
+      "To understand the importance of frogs in British society and culture",
+  },
+  ailaStreamingStatus: "Idle",
+};
 
-const meta: Meta<typeof LessonPlanDisplay> = {
+const meta = {
   title: "Components/LessonPlan/LessonPlanDisplay",
   component: LessonPlanDisplay,
   tags: ["autodocs"],
   decorators: [ChatDecorator],
   args: {
     documentContainerRef: { current: null },
+    chatEndRef: undefined,
+    sectionRefs: {},
+    showLessonMobile: false,
   },
-};
+} satisfies Meta<typeof LessonPlanDisplay>;
 
 export default meta;
 
-type Story = StoryObj<typeof LessonPlanDisplay>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
   parameters: {
-    chatContext: {},
+    chatContext,
   },
 };
 
@@ -55,6 +49,7 @@ export const Loading: Story = {
   args: {},
   parameters: {
     chatContext: {
+      ...chatContext,
       lessonPlan: {},
     },
   },
@@ -64,7 +59,9 @@ export const WithModeration: Story = {
   args: {},
   parameters: {
     chatContext: {
+      ...chatContext,
       lastModeration: {
+        id: "123",
         categories: ["l/strong-language"],
       },
     },
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx
index 064fa82b1..4119fdd70 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanDisplay.tsx
@@ -12,9 +12,8 @@ import Skeleton from "../common/Skeleton";
 import DropDownSection from "./drop-down-section";
 import { GuidanceRequired } from "./guidance-required";
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function notEmpty(value: any) {
-  return ![null, undefined, ""].includes(value);
+export function notEmpty(value: unknown) {
+  return value !== null && value !== undefined && value !== "";
 }
 
 function basedOnTitle(basedOn: string | BasedOnOptional) {
@@ -25,7 +24,7 @@ function basedOnTitle(basedOn: string | BasedOnOptional) {
 }
 
 const displayStyles = cva(
-  "relative flex flex-col space-y-10 px-14 pb-28 opacity-100 sm:px-24 ",
+  "relative flex flex-col space-y-10 px-14 pb-28 opacity-100 sm:px-24",
 );
 
 export type LessonPlanDisplayProps = Readonly<{
@@ -46,17 +45,17 @@ export const LessonPlanDisplay = ({
   const lessonPlan = {
     ...chat.lessonPlan,
     starterQuiz:
-      chat.lessonPlan._experimental_starterQuizMathsV0 ||
+      chat.lessonPlan._experimental_starterQuizMathsV0 ??
       chat.lessonPlan.starterQuiz,
     exitQuiz:
-      chat.lessonPlan._experimental_exitQuizMathsV0 || chat.lessonPlan.exitQuiz,
+      chat.lessonPlan._experimental_exitQuizMathsV0 ?? chat.lessonPlan.exitQuiz,
   };
 
   const [userHasCancelledAutoScroll, setUserHasCancelledAutoScroll] =
     useState(false);
 
   useEffect(() => {
-    const handleUserScroll = () => {
+    const handleUserScroll = (event: WheelEvent) => {
       // Check for mousewheel or touch pad scroll event
       event?.type === "wheel" && setUserHasCancelledAutoScroll(true);
     };
@@ -144,7 +143,7 @@ export const LessonPlanDisplay = ({
                 return (
                   <DropDownSection
                     key={dependant}
-                    objectKey={dependant}
+                    section={dependant}
                     sectionRefs={sectionRefs}
                     value={value}
                     userHasCancelledAutoScroll={userHasCancelledAutoScroll}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx
index b21b61f06..3b97ef53b 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lessonPlanMapToMarkDown.tsx
@@ -18,8 +18,8 @@ const LessonPlanMapToMarkDown = ({
   const lessonPlanWithExperiments = {
     ...lessonPlan,
     starterQuiz:
-      lessonPlan._experimental_starterQuizMathsV0 || lessonPlan.starterQuiz,
-    exitQuiz: lessonPlan._experimental_exitQuizMathsV0 || lessonPlan.exitQuiz,
+      lessonPlan._experimental_starterQuizMathsV0 ?? lessonPlan.starterQuiz,
+    exitQuiz: lessonPlan._experimental_exitQuizMathsV0 ?? lessonPlan.exitQuiz,
   };
   return (
     Object.entries(lessonPlanWithExperiments)
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.stories.tsx
new file mode 100644
index 000000000..d18674a0b
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.stories.tsx
@@ -0,0 +1,46 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { fn } from "@storybook/test";
+
+import { ChatDecorator } from "@/storybook/decorators/ChatDecorator";
+
+import ChatLhsHeader from "./chat-lhs-header";
+
+const meta = {
+  title: "Components/Chat/ChatLhsHeader",
+  component: ChatLhsHeader,
+  tags: ["autodocs"],
+  decorators: [ChatDecorator],
+  args: {
+    showStreamingStatus: false,
+    setShowLessonMobile: fn(),
+    showLessonMobile: false,
+    isDemoUser: false,
+  },
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Idle",
+    },
+  },
+} satisfies Meta<typeof ChatLhsHeader>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+
+export const NonProdStreamingStatus: Story = {
+  args: {
+    showStreamingStatus: true,
+  },
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "StreamingLessonPlan",
+    },
+  },
+};
+
+export const DemoBannerPadding: Story = {
+  args: {
+    isDemoUser: true,
+  },
+};
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 45fadb88e..06176163f 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-lhs-header.tsx
@@ -11,19 +11,21 @@ type ChatLhsHeaderProps = {
   setShowLessonMobile: (value: boolean) => void;
   showLessonMobile: boolean;
   isDemoUser: boolean;
+  showStreamingStatus: boolean;
 };
 
 const ChatLhsHeader = ({
   setShowLessonMobile,
   showLessonMobile,
   isDemoUser,
+  showStreamingStatus,
 }: 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" && (
+        {showStreamingStatus && (
           <div className="flex flex-grow flex-row space-x-4 text-left text-xs">
             <div data-testid="chat-aila-streaming-status">
               {chat.ailaStreamingStatus}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.stories.tsx
new file mode 100644
index 000000000..626d41a72
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.stories.tsx
@@ -0,0 +1,28 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatModerationProvider } from "@/components/ContextProviders/ChatModerationContext";
+
+import { DemoLimitMessage } from "./demo-limit-message";
+
+const meta = {
+  title: "Components/Chat/DemoLimitMessage",
+  component: DemoLimitMessage,
+  tags: ["autodocs"],
+  decorators: [
+    (Story) => (
+      <ChatModerationProvider chatId="test-chat-id">
+        <Story />
+      </ChatModerationProvider>
+    ),
+  ],
+  args: {
+    id: "test-chat-id",
+  },
+} satisfies Meta<typeof DemoLimitMessage>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {},
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.tsx
new file mode 100644
index 000000000..1bd5393b1
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.tsx
@@ -0,0 +1,22 @@
+"use client";
+
+import { ChatMessage } from "@/components/AppComponents/Chat/chat-message";
+
+export function DemoLimitMessage({ id }: Readonly<{ id: string }>) {
+  return (
+    <div className="w-full flex-col gap-11">
+      <ChatMessage
+        chatId={id}
+        ailaStreamingStatus="Idle"
+        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)"}',
+        }}
+        persistedModerations={[]}
+        separator={<span className="my-10 flex" />}
+      />
+    </div>
+  );
+}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.stories.tsx
new file mode 100644
index 000000000..0a3a91d47
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.stories.tsx
@@ -0,0 +1,32 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import {
+  DemoDecorator,
+  demoParams,
+} from "@/storybook/decorators/DemoDecorator";
+
+import { InChatDownloadButtons } from "./in-chat-download-buttons";
+
+const meta = {
+  title: "Components/Chat/InChatDownloadButtons",
+  component: InChatDownloadButtons,
+  tags: ["autodocs"],
+  args: {
+    id: "test-chat-id",
+  },
+  decorators: [DemoDecorator],
+  parameters: {
+    ...demoParams({ isDemoUser: true }),
+  },
+} satisfies Meta<typeof InChatDownloadButtons>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+
+export const SharingDisabled: Story = {
+  parameters: {
+    ...demoParams({ isDemoUser: true, isSharingEnabled: false }),
+  },
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.tsx
new file mode 100644
index 000000000..834baf05b
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.tsx
@@ -0,0 +1,63 @@
+import { OakBox, OakFlex, OakIcon, OakSpan } from "@oaknational/oak-components";
+import Link from "next/link";
+
+import { useDemoUser } from "@/components/ContextProviders/Demo";
+
+import { useDialog } from "../../DialogContext";
+
+export const InChatDownloadButtons = ({ id }: { readonly id: string }) => {
+  const demo = useDemoUser();
+  const { setDialogWindow } = useDialog();
+
+  return (
+    <OakFlex $flexDirection="column" $gap="all-spacing-7" $mv="space-between-l">
+      {demo.isSharingEnabled && (
+        <Link
+          href={demo.isSharingEnabled ? `/aila/download/${id}` : "#"}
+          onClick={() => {
+            if (!demo.isSharingEnabled) {
+              setDialogWindow("demo-share-locked");
+            }
+          }}
+        >
+          <InnerInChatButton iconName="download">Download</InnerInChatButton>
+        </Link>
+      )}
+      <button
+        onClick={() => {
+          if (demo.isSharingEnabled) {
+            setDialogWindow("share-chat");
+          } else {
+            setDialogWindow("demo-share-locked");
+          }
+        }}
+      >
+        <InnerInChatButton iconName="share">Share</InnerInChatButton>
+      </button>
+    </OakFlex>
+  );
+};
+
+const InnerInChatButton = ({
+  iconName,
+  children,
+}: {
+  readonly iconName: "download" | "share";
+  readonly children: string;
+}) => {
+  return (
+    <OakFlex
+      $pa="inner-padding-m"
+      $gap="all-spacing-3"
+      $background="white"
+      $borderRadius="border-radius-m"
+      $alignItems="center"
+      $dropShadow="drop-shadow-standard"
+    >
+      <OakBox $transform="scale">
+        <OakIcon iconName={iconName} $width="all-spacing-7" />
+      </OakBox>
+      <OakSpan $font="body-2">{children}</OakSpan>
+    </OakFlex>
+  );
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/index.tsx
similarity index 70%
rename from apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
rename to apps/nextjs/src/components/AppComponents/Chat/chat-list/index.tsx
index 32b00ee94..49446abc2 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/index.tsx
@@ -1,47 +1,24 @@
 "use client";
 
-import type { Dispatch, SetStateAction } from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
 
 import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { OakBox, OakFlex, OakIcon, OakSpan } from "@oaknational/oak-components";
 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 type { DemoContextProps } from "@/components/ContextProviders/Demo";
 
-import { useDialog } from "../DialogContext";
-import type { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
-import { useProgressForDownloads } from "./Chat/hooks/useProgressForDownloads";
-import type { DialogTypes } from "./Chat/types";
+import type { AilaStreamingStatus } from "../Chat/hooks/useAilaStreamingStatus";
+import { useProgressForDownloads } from "../Chat/hooks/useProgressForDownloads";
+import { DemoLimitMessage } from "./demo-limit-message";
+import { InChatDownloadButtons } from "./in-chat-download-buttons";
 
 export interface ChatListProps {
   isDemoLocked: boolean;
   showLessonMobile: boolean;
   demo: DemoContextProps;
 }
-
-function DemoLimitMessage({ id }: Readonly<{ id: string }>) {
-  return (
-    <div className="w-full flex-col gap-11">
-      <ChatMessage
-        chatId={id}
-        ailaStreamingStatus="Idle"
-        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)"}',
-        }}
-        persistedModerations={[]}
-        separator={<span className="my-10 flex" />}
-      />
-    </div>
-  );
-}
-
 export function ChatList({
   isDemoLocked,
   showLessonMobile,
@@ -129,7 +106,6 @@ export const ChatMessagesDisplay = ({
   demo,
 }: ChatMessagesDisplayProps) => {
   const { lessonPlan, isStreaming } = useLessonChat();
-  const { setDialogWindow } = useDialog();
   const { totalSections, totalSectionsComplete } = useProgressForDownloads({
     lessonPlan,
     isStreaming,
@@ -228,71 +204,7 @@ export const ChatMessagesDisplay = ({
             (message.role !== "user" &&
               message.content.includes("download") &&
               message.content.includes("share")),
-        ) && <InChatDownloadButtons {...{ demo, id, setDialogWindow }} />}
+        ) && <InChatDownloadButtons {...{ demo, id }} />}
     </>
   );
 };
-
-const InChatDownloadButtons = ({
-  demo,
-  id,
-  setDialogWindow,
-}: {
-  readonly demo: DemoContextProps;
-  readonly id: string;
-  readonly setDialogWindow: Dispatch<SetStateAction<DialogTypes>>;
-}) => {
-  return (
-    <OakFlex $flexDirection="column" $gap="all-spacing-7" $mv="space-between-l">
-      {demo.isSharingEnabled && (
-        <Link
-          href={demo.isSharingEnabled ? `/aila/download/${id}` : "#"}
-          onClick={() => {
-            if (!demo.isSharingEnabled) {
-              setDialogWindow("demo-share-locked");
-            }
-          }}
-        >
-          <InnerInChatButton iconName="download">Download</InnerInChatButton>
-        </Link>
-      )}
-      <button
-        onClick={() => {
-          if (demo.isSharingEnabled) {
-            setDialogWindow("share-chat");
-          } else {
-            setDialogWindow("demo-share-locked");
-          }
-        }}
-      >
-        <InnerInChatButton iconName="share">Share</InnerInChatButton>
-      </button>
-    </OakFlex>
-  );
-};
-
-const InnerInChatButton = ({
-  iconName,
-
-  children,
-}: {
-  readonly iconName: "download" | "share";
-
-  readonly children: string;
-}) => {
-  return (
-    <OakFlex
-      $pa="inner-padding-m"
-      $gap="all-spacing-3"
-      $background="white"
-      $borderRadius="border-radius-m"
-      $alignItems="center"
-      $dropShadow="drop-shadow-standard"
-    >
-      <OakBox $transform="scale">
-        <OakIcon iconName={iconName} $width="all-spacing-7" />
-      </OakBox>
-      <OakSpan $font="body-2">{children}</OakSpan>
-    </OakFlex>
-  );
-};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.stories.tsx
new file mode 100644
index 000000000..a0bfcc600
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.stories.tsx
@@ -0,0 +1,74 @@
+import type { MessagePart } from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatMessagePart } from "./ChatMessagePart";
+
+const meta = {
+  title: "Components/Chat/ChatMessagePart",
+  component: ChatMessagePart,
+  tags: ["autodocs"],
+  args: {
+    inspect: false,
+  },
+} satisfies Meta<typeof ChatMessagePart>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+const basePart: Omit<MessagePart, "document"> = {
+  type: "message-part",
+  id: "test-part-id",
+  isPartial: false,
+};
+
+export const PromptMessagePart: Story = {
+  args: {
+    part: {
+      ...basePart,
+      document: {
+        type: "prompt",
+        message:
+          "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.",
+      },
+    },
+  },
+};
+
+export const ErrorMessagePart: Story = {
+  args: {
+    part: {
+      ...basePart,
+      document: {
+        type: "error",
+        message:
+          "**Unfortunately you’ve exceeded your fair usage limit for today.** Please come back in 11 hours. If you require a higher limit, please [make a request](https://forms.gle/tHsYMZJR367zydsG8).",
+      },
+    },
+  },
+};
+
+export const TextMessagePart: Story = {
+  args: {
+    part: {
+      ...basePart,
+      document: {
+        type: "text",
+        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.",
+      },
+    },
+  },
+};
+
+export const WithInspector: Story = {
+  args: {
+    inspect: true,
+    part: {
+      ...basePart,
+      document: {
+        type: "prompt",
+        message: "This is a prompt",
+      },
+    },
+  },
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.tsx
new file mode 100644
index 000000000..1876d9e4b
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.tsx
@@ -0,0 +1,88 @@
+import type {
+  ErrorDocument,
+  MessagePart,
+  PromptDocument,
+  TextDocument,
+} from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import { aiLogger } from "@oakai/logger";
+
+import { MemoizedReactMarkdownWithStyles } from "@/components/AppComponents/Chat/markdown";
+
+const log = aiLogger("chat");
+
+const components = {
+  comment: NonRenderedPart,
+  prompt: PromptMessagePart,
+  error: ErrorMessagePart,
+  bad: NonRenderedPart,
+  patch: NonRenderedPart,
+  /**
+   * Patches do not get rendered, they get applied to the lesson plan
+   * state, which is then rendered in the right hand side.
+   */
+  experimentalPatch: NonRenderedPart,
+  state: NonRenderedPart,
+  text: TextMessagePart,
+  action: NonRenderedPart,
+  moderation: NonRenderedPart,
+  id: NonRenderedPart,
+  unknown: NonRenderedPart,
+};
+
+export interface ChatMessagePartProps {
+  part: MessagePart;
+  inspect: boolean;
+}
+
+export function ChatMessagePart({
+  part,
+  inspect,
+}: Readonly<ChatMessagePartProps>) {
+  const PartComponent = components[part.document.type] as React.ComponentType<{
+    part: typeof part.document;
+  }>;
+
+  if (!PartComponent) {
+    log.info("Unknown part type", part.document.type, JSON.stringify(part));
+    return null;
+  }
+
+  return (
+    <div className="w-full">
+      <PartComponent part={part.document} />
+
+      {inspect && <PartInspector part={part} />}
+    </div>
+  );
+}
+
+function NonRenderedPart() {
+  return null;
+}
+
+function PromptMessagePart({ part }: Readonly<{ part: PromptDocument }>) {
+  return <MemoizedReactMarkdownWithStyles markdown={part.message} />;
+}
+
+function ErrorMessagePart({
+  part,
+}: Readonly<{
+  part: ErrorDocument;
+}>) {
+  const markdown = part.message ?? "Sorry, an error has occurred";
+  return <MemoizedReactMarkdownWithStyles markdown={markdown} />;
+}
+
+function TextMessagePart({ part }: Readonly<{ part: TextDocument }>) {
+  return <MemoizedReactMarkdownWithStyles markdown={part.value} />;
+}
+
+function PartInspector({ part }: Readonly<{ part: MessagePart }>) {
+  return (
+    <div className="w-full bg-gray-200 px-8 py-16">
+      <pre className="w-full text-wrap text-xs">
+        {JSON.stringify(part, null, 2)}
+      </pre>
+    </div>
+  );
+}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.stories.tsx
new file mode 100644
index 000000000..e2901608f
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.stories.tsx
@@ -0,0 +1,59 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatModerationProvider } from "@/components/ContextProviders/ChatModerationContext";
+
+import { ChatMessage } from "./";
+
+const meta = {
+  title: "Components/Chat/ChatMessage",
+  component: ChatMessage,
+  tags: ["autodocs"],
+  decorators: [
+    (Story) => (
+      <ChatModerationProvider chatId="test-chat-id">
+        <Story />
+      </ChatModerationProvider>
+    ),
+  ],
+  args: {
+    chatId: "test-chat-id",
+    persistedModerations: [],
+    ailaStreamingStatus: "Idle",
+  },
+} satisfies Meta<typeof ChatMessage>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const UserMessage: Story = {
+  args: {
+    message: {
+      id: "test-chat-id",
+      content:
+        "Create a lesson plan about the end of Roman Britain for key stage 3 history",
+      role: "user",
+    },
+  },
+};
+
+export const LlmMessage: Story = {
+  args: {
+    message: {
+      id: "test-chat-id",
+      content:
+        '{"type":"llmMessage","sectionsToEdit":["learningOutcome","learningCycles"],"patches":[{"type":"patch","reasoning":"Since there are no existing Oak lessons for this topic, I have created a new lesson plan from scratch focusing on the end of Roman Britain.","value":{"type":"string","op":"add","path":"/learningOutcome","value":"I can explain the reasons behind the decline of Roman Britain and its impact on society."},"status":"complete"},{"type":"patch","reasoning":"I have outlined the learning cycles to break down the lesson structure for teaching about the end of Roman Britain.","value":{"type":"string-array","op":"add","path":"/learningCycles","value":["Identify the key events leading to the end of Roman Britain.","Describe the societal changes that occurred post-Roman withdrawal.","Analyse the archaeological evidence of Roman Britain\'s legacy."]},"status":"complete"}],"sectionsEdited":["learningOutcome","learningCycles"],"prompt":{"type":"text","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"}',
+      role: "assistant",
+    },
+  },
+};
+
+export const ErrorMessage: Story = {
+  args: {
+    message: {
+      id: "test-chat-id",
+      role: "assistant",
+      content:
+        '{"type":"error","value":"Rate limit exceeded","message":"**Unfortunately you’ve exceeded your fair usage limit for today.** Please come back in 11 hours. If you require a higher limit, please [make a request](https://forms.gle/tHsYMZJR367zydsG8)."}',
+    },
+  },
+};
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 b29b77a29..9ad0c1644 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
@@ -1,26 +1,12 @@
 // 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 type { ReactNode } from "react";
+import type { ReactNode, JSX } from "react";
 import { useState } from "react";
 
-import type {
-  ActionDocument,
-  BadDocument,
-  CommentDocument,
-  ErrorDocument,
-  ExperimentalPatchDocument,
-  MessagePart,
-  ModerationDocument,
-  PatchDocument,
-  PromptDocument,
-  StateDocument,
-  TextDocument,
-  UnknownDocument,
-} from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import type { MessagePart } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { parseMessageParts } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { isSafe } from "@oakai/core/src/utils/ailaModeration/helpers";
 import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { aiLogger } from "@oakai/logger";
 import type { Message } from "ai";
 
 import { MemoizedReactMarkdownWithStyles } from "@/components/AppComponents/Chat/markdown";
@@ -28,12 +14,10 @@ import { useChatModeration } from "@/components/ContextProviders/ChatModerationC
 import { Icon } from "@/components/Icon";
 import { cn } from "@/lib/utils";
 
-import type { ModerationModalHelpers } from "../../FeedbackForms/ModerationFeedbackModal";
 import type { AilaStreamingStatus } from "../Chat/hooks/useAilaStreamingStatus";
+import { ChatMessagePart } from "./ChatMessagePart";
 import { isModeration } from "./protocol";
 
-const log = aiLogger("chat");
-
 export interface ChatMessageProps {
   chatId: string; // Needed for when we refactor to use a moderation provider
   message: Message;
@@ -136,22 +120,18 @@ export function ChatMessage({
         errorType={hasError ? "generic" : null}
         type={getAvatarType()}
       >
-        <div
-          className="absolute left-0 top-0 h-20 w-20 "
+        <button
+          className="absolute left-0 top-0 h-20 w-20"
           onClick={() => {
             setInspect(!inspect);
           }}
         />
         <MessageTextWrapper>
           {message.id !== "working-on-it-initial" &&
-            messageParts.map((part, index) => {
+            messageParts.map((part) => {
               return (
-                <div className="w-full" key={index}>
-                  <ChatMessagePart
-                    part={part}
-                    moderationModalHelpers={moderationModalHelpers}
-                    inspect={inspect}
-                  />
+                <div className="w-full" key={part.id}>
+                  <ChatMessagePart part={part} inspect={inspect} />
                 </div>
               );
             })}
@@ -216,135 +196,8 @@ function MessageWrapper({
 
 function MessageTextWrapper({ children }: Readonly<{ children: ReactNode }>) {
   return (
-    <div className=" flex w-full flex-col items-start justify-between">
+    <div className="flex w-full flex-col items-start justify-between">
       {children}
     </div>
   );
 }
-
-export interface ChatMessagePartProps {
-  part: MessagePart;
-  inspect: boolean;
-  moderationModalHelpers: ModerationModalHelpers;
-}
-
-function ChatMessagePart({
-  part,
-  inspect,
-  moderationModalHelpers,
-}: Readonly<ChatMessagePartProps>) {
-  const PartComponent = {
-    comment: CommentMessagePart,
-    prompt: PromptMessagePart,
-    error: ErrorMessagePart,
-    bad: BadMessagePart,
-    patch: PatchMessagePart,
-    experimentalPatch: ExperimentalPatchMessageComponent,
-    state: StateMessagePart,
-    text: TextMessagePart,
-    action: ActionMessagePart,
-    moderation: ModerationMessagePart,
-    id: IdMessagePart,
-    unknown: UnknownMessagePart,
-  }[part.document.type] as React.ComponentType<{
-    part: typeof part.document;
-    moderationModalHelpers: ModerationModalHelpers;
-  }>;
-
-  if (!PartComponent) {
-    log.info("Unknown part type", part.document.type, JSON.stringify(part));
-    return null;
-  }
-
-  return (
-    <div className="w-full">
-      <PartComponent
-        part={part.document}
-        moderationModalHelpers={moderationModalHelpers}
-      />
-
-      {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        inspect && <PartInspector part={part} />
-      }
-    </div>
-  );
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function BadMessagePart({ part }: Readonly<{ part: BadDocument }>) {
-  return null;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function CommentMessagePart({ part }: Readonly<{ part: CommentDocument }>) {
-  return null;
-}
-
-function PromptMessagePart({ part }: Readonly<{ part: PromptDocument }>) {
-  return <MemoizedReactMarkdownWithStyles markdown={part.message} />;
-}
-
-function ModerationMessagePart({
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  part,
-}: Readonly<{ part: ModerationDocument }>) {
-  return null;
-}
-
-function ErrorMessagePart({
-  part,
-}: Readonly<{
-  part: ErrorDocument;
-}>) {
-  const markdown = part.message || "Sorry, an error has occurred";
-  return <MemoizedReactMarkdownWithStyles markdown={markdown} />;
-}
-
-function TextMessagePart({ part }: Readonly<{ part: TextDocument }>) {
-  return <MemoizedReactMarkdownWithStyles markdown={part.value} />;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function PatchMessagePart({ part }: Readonly<{ part: PatchDocument }>) {
-  return null;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function StateMessagePart({ part }: Readonly<{ part: StateDocument }>) {
-  return null;
-}
-
-function IdMessagePart() {
-  return null;
-}
-
-function ActionMessagePart({
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  part,
-}: Readonly<{ part: ActionDocument }>) {
-  return null;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function UnknownMessagePart({ part }: Readonly<{ part: UnknownDocument }>) {
-  return null;
-}
-
-function PartInspector({ part }: Readonly<{ part: MessagePart }>) {
-  return (
-    <div className="w-full bg-gray-200 px-8 py-16">
-      <pre className="w-full text-wrap text-xs">
-        {JSON.stringify(part, null, 2)}
-      </pre>
-    </div>
-  );
-}
-
-/**
- * Patches do not get rendered, they get applied to the lesson plan
- * state, which is then rendered in the right hand side.
- */
-function ExperimentalPatchMessageComponent() {
-  return null;
-}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-panel-disclaimer.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-panel-disclaimer.tsx
index 4d291ae7a..b0f18e05d 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-panel-disclaimer.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-panel-disclaimer.tsx
@@ -1,4 +1,8 @@
-const ChatPanelDisclaimer = ({ size }: { readonly size: "sm" | "md" | "lg" }) => {
+const ChatPanelDisclaimer = ({
+  size,
+}: {
+  readonly size: "sm" | "md" | "lg";
+}) => {
   return (
     <p className={`my-12 text-${size}`}>
       Aila can make mistakes. Check your lesson before use. See our{" "}
@@ -9,7 +13,7 @@ const ChatPanelDisclaimer = ({ size }: { readonly size: "sm" | "md" | "lg" }) =>
       >
         terms and conditions
       </a>
-      .
+      {"."}
     </p>
   );
 };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-panel.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-panel.stories.tsx
new file mode 100644
index 000000000..384b1f794
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-panel.stories.tsx
@@ -0,0 +1,141 @@
+import type { Message } from "@oakai/aila/src/core/chat";
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatDecorator } from "@/storybook/decorators/ChatDecorator";
+import { LessonPlanTrackingDecorator } from "@/storybook/decorators/LessonPlanTrackingDecorator";
+import { SidebarDecorator } from "@/storybook/decorators/SidebarDecorator";
+
+import { ChatPanel } from "./chat-panel";
+
+const DummyMessage: Message = {
+  content: "Dummy message",
+  id: "123",
+  role: "user",
+};
+
+const meta = {
+  title: "Components/Chat/ChatPanel",
+  component: ChatPanel,
+  tags: ["autodocs"],
+  decorators: [ChatDecorator, LessonPlanTrackingDecorator, SidebarDecorator],
+  args: {
+    isDemoLocked: false,
+  },
+  parameters: {
+    chatContext: {
+      messages: [DummyMessage],
+    },
+  },
+} satisfies Meta<typeof ChatPanel>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const NoMessages: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      messages: [],
+    },
+  },
+};
+
+export const DemoLocked: Story = {
+  args: {
+    isDemoLocked: true,
+  },
+};
+
+export const Idle: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Idle",
+    },
+  },
+};
+
+export const IdleWithQueuedUserAction: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      queuedUserAction: "regenerate",
+      ailaStreamingStatus: "Idle",
+    },
+  },
+};
+
+export const Loading: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Loading",
+    },
+  },
+};
+
+export const RequestMade: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "RequestMade",
+    },
+  },
+};
+
+export const StreamingLessonPlan: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "StreamingLessonPlan",
+    },
+  },
+};
+
+export const StreamingChatResponse: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "StreamingChatResponse",
+    },
+  },
+};
+
+export const StreamingWithQueuedUserAction: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      queuedUserAction: "regenerate",
+      ailaStreamingStatus: "StreamingLessonPlan",
+    },
+  },
+};
+
+export const Moderating: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Moderating",
+    },
+  },
+};
+
+export const ModeratingWithRegenerateUserAction: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      queuedUserAction: "regenerate",
+      ailaStreamingStatus: "Moderating",
+    },
+  },
+};
+
+export const CustomQueuedUserAction: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      queuedUserAction: "Increase the reading age of that section",
+      ailaStreamingStatus: "Moderating",
+    },
+  },
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-panel.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-panel.tsx
index fca32ed91..b2b58dcb2 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-panel.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-panel.tsx
@@ -1,6 +1,5 @@
 import { cva } from "class-variance-authority";
 
-import { ButtonScrollToBottom } from "@/components/AppComponents/Chat/button-scroll-to-bottom";
 import { PromptForm } from "@/components/AppComponents/Chat/prompt-form";
 import { useLessonChat } from "@/components/ContextProviders/ChatProvider";
 import useAnalytics from "@/lib/analytics/useAnalytics";
@@ -8,7 +7,6 @@ import useAnalytics from "@/lib/analytics/useAnalytics";
 import ChatPanelDisclaimer from "./chat-panel-disclaimer";
 
 interface ChatPanelProps {
-  isEmptyScreen: boolean;
   isDemoLocked: boolean;
 }
 
@@ -18,13 +16,11 @@ function LockedPromptForm() {
   );
 }
 
-export function ChatPanel({
-  isEmptyScreen,
-  isDemoLocked,
-}: Readonly<ChatPanelProps>) {
+export function ChatPanel({ isDemoLocked }: Readonly<ChatPanelProps>) {
   const chat = useLessonChat();
   const {
     id,
+    messages,
     isLoading,
     input,
     setInput,
@@ -34,12 +30,13 @@ export function ChatPanel({
     queuedUserAction,
   } = chat;
 
+  const hasMessages = !!messages.length;
+
   const { trackEvent } = useAnalytics();
-  const containerClass = `grid w-full grid-cols-1 ${isEmptyScreen ? "sm:grid-cols-1" : ""} peer-[[data-state=open]]:group-[]:lg:pl-[250px] peer-[[data-state=open]]:group-[]:xl:pl-[300px]`;
+  const containerClass = `grid w-full grid-cols-1 ${hasMessages ? "sm:grid-cols-1" : ""} peer-[[data-state=open]]:group-[]:lg:pl-[250px] peer-[[data-state=open]]:group-[]:xl:pl-[300px]`;
   return (
     <div className={containerClass}>
-      <ButtonScrollToBottom />
-      <div className={chatBoxWrap({ isEmptyScreen })}>
+      <div className={chatBoxWrap({ hasMessages })}>
         {!isDemoLocked && (
           <PromptForm
             onSubmit={async (value) => {
@@ -57,7 +54,7 @@ export function ChatPanel({
             input={input}
             setInput={setInput}
             ailaStreamingStatus={ailaStreamingStatus}
-            isEmptyScreen={isEmptyScreen}
+            hasMessages={hasMessages}
             queueUserAction={queueUserAction}
             queuedUserAction={queuedUserAction}
           />
@@ -73,7 +70,7 @@ export function ChatPanel({
 
 const chatBoxWrap = cva(["mx-auto w-full  "], {
   variants: {
-    isEmptyScreen: {
+    hasMessages: {
       false: "max-w-2xl ",
       true: "",
     },
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.stories.tsx
new file mode 100644
index 000000000..05adefe11
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.stories.tsx
@@ -0,0 +1,112 @@
+import type { Message } from "@oakai/aila/src/core/chat";
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatDecorator } from "@/storybook/decorators/ChatDecorator";
+import { LessonPlanTrackingDecorator } from "@/storybook/decorators/LessonPlanTrackingDecorator";
+
+import ChatQuickButtons from "./chat-quick-buttons";
+
+const DummyMessage: Message = {
+  content: "Dummy message",
+  id: "123",
+  role: "user",
+};
+
+const meta = {
+  title: "Components/Chat/ChatQuickButtons",
+  component: ChatQuickButtons,
+  tags: ["autodocs"],
+  decorators: [ChatDecorator, LessonPlanTrackingDecorator],
+  parameters: {
+    chatContext: {
+      messages: [DummyMessage],
+    },
+  },
+} satisfies Meta<typeof ChatQuickButtons>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Idle: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Idle",
+    },
+  },
+};
+
+export const Loading: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Loading",
+    },
+  },
+};
+
+export const LoadingWithoutMessages: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Loading",
+      messages: [],
+    },
+  },
+};
+
+export const RequestMade: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "RequestMade",
+    },
+  },
+};
+
+export const StreamingLessonPlan: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "StreamingLessonPlan",
+    },
+  },
+};
+
+export const StreamingChatResponse: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "StreamingChatResponse",
+    },
+  },
+};
+
+export const Moderating: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      ailaStreamingStatus: "Moderating",
+    },
+  },
+};
+
+export const StreamingWithQueuedUserAction: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      queuedUserAction: "regenerate",
+      ailaStreamingStatus: "StreamingLessonPlan",
+    },
+  },
+};
+
+export const ModeratingWithQueuedUserAction: Story = {
+  args: {},
+  parameters: {
+    chatContext: {
+      queuedUserAction: "regenerate",
+      ailaStreamingStatus: "Moderating",
+    },
+  },
+};
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 4a97e507f..de37e5a74 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-quick-buttons.tsx
@@ -12,16 +12,12 @@ import type { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
 import ChatButton from "./ui/chat-button";
 import { IconRefresh, IconStop } from "./ui/icons";
 
-export type QuickActionButtonsProps = Readonly<{
-  isEmptyScreen: boolean;
-}>;
-
 const shouldAllowStop = (
   ailaStreamingStatus: AilaStreamingStatus,
-  isEmptyScreen: boolean,
+  hasMessages: boolean,
   queuedUserAction: string | null,
 ) => {
-  if (!isEmptyScreen) {
+  if (!hasMessages) {
     return false;
   }
 
@@ -43,7 +39,7 @@ const shouldAllowStop = (
   return false;
 };
 
-const QuickActionButtons = ({ isEmptyScreen }: QuickActionButtonsProps) => {
+const QuickActionButtons = () => {
   const chat = useLessonChat();
   const { trackEvent } = useAnalytics();
   const lessonPlanTracking = useLessonPlanTracking();
@@ -57,13 +53,15 @@ const QuickActionButtons = ({ isEmptyScreen }: QuickActionButtonsProps) => {
     queuedUserAction,
   } = chat;
 
+  const hasMessages = !!messages.length;
+
   const shouldAllowUserAction =
     ["Idle", "Moderating"].includes(ailaStreamingStatus) && !queuedUserAction;
 
   const handleRegenerate = useCallback(() => {
     trackEvent("chat:regenerate", { id: id });
     const lastUserMessage =
-      findLast(messages, (m) => m.role === "user")?.content || "";
+      findLast(messages, (m) => m.role === "user")?.content ?? "";
     lessonPlanTracking.onClickRetry(lastUserMessage);
     queueUserAction("regenerate");
   }, [queueUserAction, lessonPlanTracking, messages, trackEvent, id]);
@@ -106,7 +104,7 @@ const QuickActionButtons = ({ isEmptyScreen }: QuickActionButtonsProps) => {
 
         {shouldAllowStop(
           ailaStreamingStatus,
-          isEmptyScreen,
+          hasMessages,
           queuedUserAction,
         ) && (
           <ChatButton
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 5be3e7430..8a7fa2b7b 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,5 +1,7 @@
 import React, { useRef, useState } from "react";
 
+import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
+
 import { useLessonChat } from "@/components/ContextProviders/ChatProvider";
 
 import AiIcon from "../../AiIcon";
@@ -30,7 +32,9 @@ const ChatRightHandSideLesson = ({
   const [showScrollButton, setShowScrollButton] = useState(false);
 
   // This retains this existing bug, but is fixed on subsequent PRs
-  const sectionRefs = {};
+  const sectionRefs: Partial<
+    Record<LessonPlanKeys, React.MutableRefObject<HTMLDivElement | null>>
+  > = {};
 
   const scrollToBottom = () => {
     if (chatEndRef.current) {
@@ -57,7 +61,7 @@ const ChatRightHandSideLesson = ({
 
   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}
@@ -92,7 +96,7 @@ const ChatRightHandSideLesson = ({
         />
       </div>
       <div
-        className={`${messages.length > 1 && showLessonMobile ? "flex" : "hidden"}  fixed bottom-20 left-0 right-0 items-center justify-center duration-150  sm:hidden`}
+        className={`${messages.length > 1 && showLessonMobile ? "flex" : "hidden"} fixed bottom-20 left-0 right-0 items-center justify-center duration-150 sm:hidden`}
       >
         <ChatButton
           variant="primary"
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-start-accordion.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-start-accordion.tsx
deleted file mode 100644
index 0fecdf1e6..000000000
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-start-accordion.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-"use client";
-
-import React from "react";
-
-import * as Accordion from "@radix-ui/react-accordion";
-import { lessonSections } from "ai-apps/lesson-planner/lessonSection";
-
-import { Icon } from "@/components/Icon";
-import AiIcon from "@/components/SVGParts/AiIcon";
-import LessonIcon from "@/components/SVGParts/LessonIcon";
-import QuizIcon from "@/components/SVGParts/QuizIcon";
-import SlidesIcon from "@/components/SVGParts/SlidesIcon";
-import { convertTitleCaseToSentenceCase } from "@/utils/convertTitleCaseToSentenceCase";
-
-import { handleRewordingSections } from "./export-buttons";
-
-const ChatStartAccordion = () => {
-  const slidesLessonSections = lessonSections.filter(
-    (section) =>
-      section !== "Title" &&
-      section !== "Key stage" &&
-      section !== "Subject" &&
-      section !== "Prior knowledge" &&
-      section !== "Key learning points" &&
-      section !== "Misconceptions" &&
-      section !== "Starter quiz" &&
-      section !== "Exit Quiz",
-  );
-
-  const quizLessonSections = lessonSections.filter(
-    (section) =>
-      section !== "Title" &&
-      section !== "Key stage" &&
-      section !== "Subject" &&
-      section !== "Prior lnowledge" &&
-      section !== "Key learning points" &&
-      section !== "Misconceptions" &&
-      section !== "Learning cycle 1" &&
-      section !== "Keywords" &&
-      section !== "Learning cycles" &&
-      section !== "Learning outcome",
-  );
-
-  return (
-    <Accordion.Root type="single" collapsible>
-      <AccordionItem value="item-1">
-        <AccordionTrigger>
-          <AiIcon />1 lesson plan
-        </AccordionTrigger>
-        <AccordionContent>
-          <div className="flex flex-col gap-8 pl-20">
-            {lessonSections.map((section) => {
-              if (
-                section == "Title" ||
-                section == "Key stage" ||
-                section == "Subject"
-              ) {
-                return null;
-              }
-              return (
-                <div className="flex items-center gap-8" key={section}>
-                  <Icon icon="tick" size="sm" />
-                  <span className="text-base">
-                    {convertTitleCaseToSentenceCase(
-                      handleRewordingSections(section),
-                    )}
-                  </span>
-                </div>
-              );
-            })}
-          </div>
-        </AccordionContent>
-      </AccordionItem>
-      <AccordionItem value="item-2">
-        <AccordionTrigger>
-          <SlidesIcon />1 slide deck
-        </AccordionTrigger>
-        <AccordionContent>
-          <div className="flex flex-col gap-8 pl-20">
-            {slidesLessonSections.map((section) => {
-              if (
-                section == "Title" ||
-                section == "Key stage" ||
-                section == "Subject"
-              ) {
-                return null;
-              }
-              return (
-                <div className="flex items-center gap-8" key={section}>
-                  <Icon icon="tick" size="sm" />
-                  <span className="text-base">
-                    {convertTitleCaseToSentenceCase(
-                      handleRewordingSections(section),
-                    )}
-                  </span>
-                </div>
-              );
-            })}
-          </div>
-        </AccordionContent>
-      </AccordionItem>
-      <AccordionItem value="item-3">
-        <AccordionTrigger>
-          <QuizIcon />2 quizzes
-        </AccordionTrigger>
-        <AccordionContent>
-          <div className="flex flex-col gap-8 pl-20">
-            {quizLessonSections.map((section) => {
-              if (
-                section == "Title" ||
-                section == "Key stage" ||
-                section == "Subject"
-              ) {
-                return null;
-              }
-              return (
-                <div className="flex items-center gap-8" key={section}>
-                  <Icon icon="tick" size="sm" />
-                  <span className="text-base">
-                    {convertTitleCaseToSentenceCase(
-                      handleRewordingSections(section),
-                    )}
-                  </span>
-                </div>
-              );
-            })}
-          </div>
-        </AccordionContent>
-      </AccordionItem>
-      <AccordionItem value="item-4">
-        <div className="flex w-full items-center justify-between ">
-          <span className="flex w-full items-center gap-10 text-left text-base font-bold">
-            <LessonIcon />1 worksheet
-          </span>
-        </div>
-      </AccordionItem>
-    </Accordion.Root>
-  );
-};
-
-// Define prop types for each component
-interface AccordionItemProps
-  extends React.ComponentPropsWithoutRef<typeof Accordion.Item> {
-  readonly children: React.ReactNode;
-}
-
-interface AccordionTriggerProps
-  extends React.ComponentPropsWithoutRef<typeof Accordion.Trigger> {
-  readonly children: React.ReactNode;
-}
-
-interface AccordionContentProps
-  extends React.ComponentPropsWithoutRef<typeof Accordion.Content> {
-  readonly children: React.ReactNode;
-}
-
-const AccordionItem = React.forwardRef<HTMLDivElement, AccordionItemProps>(
-  ({ children, ...props }, forwardedRef) => (
-    <Accordion.Item
-      {...props}
-      ref={forwardedRef}
-      className="border-b border-black border-opacity-20 py-10 first:border-t"
-    >
-      {children}
-    </Accordion.Item>
-  ),
-);
-AccordionItem.displayName = "AccordionItem";
-
-const AccordionTrigger = React.forwardRef<
-  HTMLDivElement,
-  AccordionTriggerProps
->(({ children, ...props }) => (
-  <Accordion.Trigger
-    {...props}
-    className="flex w-full items-center justify-between "
-  >
-    <span className="flex w-full items-center gap-10 text-left text-base font-bold">
-      {children}
-    </span>
-    <Icon icon="chevron-down" size="sm" />
-  </Accordion.Trigger>
-));
-AccordionTrigger.displayName = "AccordionTrigger";
-
-const AccordionContent = React.forwardRef<
-  HTMLDivElement,
-  AccordionContentProps
->(({ children, ...props }, forwardedRef) => (
-  <Accordion.Content {...props} ref={forwardedRef}>
-    <div className="mt-10">{children}</div>
-  </Accordion.Content>
-));
-
-AccordionContent.displayName = "AccordionContent";
-
-export default ChatStartAccordion;
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx
index f57506495..22f08d579 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx
@@ -2,14 +2,14 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import { ChatStartForm } from "./chat-start-form";
 
-const meta: Meta<typeof ChatStartForm> = {
-  title: "Components/Chat/ChatStartForm",
+const meta = {
+  title: "Components/Chat Start/ChatStartForm",
   component: ChatStartForm,
   tags: ["autodocs"],
-};
+} satisfies Meta<typeof ChatStartForm>;
 
 export default meta;
-type Story = StoryObj<typeof ChatStartForm>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-start.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-start.stories.tsx
index d02716551..45f1c3ecc 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-start.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-start.stories.tsx
@@ -1,16 +1,18 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
 import { DemoProvider } from "@/components/ContextProviders/Demo";
+import { chromaticParams } from "@/storybook/chromatic";
 
 import { DialogProvider } from "../DialogContext";
 import { ChatStart } from "./chat-start";
 
-const meta: Meta<typeof ChatStart> = {
+const meta = {
   title: "Pages/Chat/Chat Start",
   component: ChatStart,
   parameters: {
     // Including custom decorators changes the layout from fullscreen
     layout: "fullscreen",
+    ...chromaticParams(["mobile", "desktop"]),
   },
   decorators: [
     (Story) => (
@@ -21,10 +23,10 @@ const meta: Meta<typeof ChatStart> = {
       </DialogProvider>
     ),
   ],
-};
+} satisfies Meta<typeof ChatStart>;
 
 export default meta;
-type Story = StoryObj<typeof ChatStart>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
diff --git a/apps/nextjs/src/components/AppComponents/Chat/clear-history.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/clear-history.stories.tsx
index 084254fb1..de0d65c04 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/clear-history.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/clear-history.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import { ClearHistory } from "./clear-history";
 
-const meta: Meta<typeof ClearHistory> = {
+const meta = {
   title: "Components/Sidebar/ClearHistory",
   component: ClearHistory,
   tags: ["autodocs"],
@@ -14,10 +14,10 @@ const meta: Meta<typeof ClearHistory> = {
       return <Story />;
     },
   ],
-};
+} satisfies Meta<typeof ClearHistory>;
 
 export default meta;
-type Story = StoryObj<typeof ClearHistory>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
diff --git a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/action-button-wrapper.tsx b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/action-button-wrapper.tsx
index 3db3b8c30..447d1f527 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/action-button-wrapper.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/action-button-wrapper.tsx
@@ -1,6 +1,7 @@
 import { useRef, useState } from "react";
 
 import { getLastAssistantMessage } from "@oakai/aila/src/helpers/chat/getLastAssistantMessage";
+import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
 import { OakBox } from "@oaknational/oak-components";
 import type { AilaUserModificationAction } from "@prisma/client";
 
@@ -18,7 +19,7 @@ import type { FeedbackOption } from "./drop-down-form-wrapper";
 export type ActionButtonWrapperProps = Readonly<{
   sectionTitle: string;
   sectionPath: string;
-  sectionValue: Record<string, unknown> | string | Array<unknown>;
+  sectionValue: LessonPlanSectionWhileStreaming;
   options: ModifyOptions | AdditionalMaterialOptions;
   buttonText: string;
   actionButtonLabel: string;
@@ -59,7 +60,7 @@ const ActionButtonWrapper = ({
         chatId: id,
         messageId: lastAssistantMessage.id,
         sectionPath,
-        sectionValue,
+        sectionValue: String(sectionValue),
         action: selectedRadio.enumValue,
         actionOtherText: userFeedbackText || null,
       };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/add-additional-materials-button.tsx b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/add-additional-materials-button.tsx
index 23a0353b3..8b2e58468 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/add-additional-materials-button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/add-additional-materials-button.tsx
@@ -1,3 +1,4 @@
+import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
 import type { AilaUserModificationAction } from "@prisma/client";
 
 import ActionButtonWrapper from "./action-button-wrapper";
@@ -7,7 +8,7 @@ import type { FeedbackOption } from "./drop-down-form-wrapper";
 export type AdditionalMaterialsProps = Readonly<{
   sectionTitle: string;
   sectionPath: string;
-  sectionValue: Record<string, unknown> | string | Array<unknown>;
+  sectionValue: LessonPlanSectionWhileStreaming;
 }>;
 
 const AddAdditionalMaterialsButton = ({
diff --git a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/chat-section.tsx b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/chat-section.tsx
index e999b74c6..7e1d8b207 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/chat-section.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/chat-section.tsx
@@ -1,3 +1,7 @@
+import type {
+  LessonPlanKeys,
+  LessonPlanSectionWhileStreaming,
+} from "@oakai/aila/src/protocol/schema";
 import { sectionToMarkdown } from "@oakai/aila/src/protocol/sectionToMarkdown";
 import { OakFlex } from "@oaknational/oak-components";
 import { lessonSectionTitlesAndMiniDescriptions } from "data/lessonSectionTitlesAndMiniDescriptions";
@@ -9,17 +13,18 @@ import FlagButton from "./flag-button";
 import ModifyButton from "./modify-button";
 
 export type ChatSectionProps = Readonly<{
-  objectKey: string;
-  value: Record<string, unknown> | string | Array<unknown>;
+  section: LessonPlanKeys;
+  value: LessonPlanSectionWhileStreaming;
 }>;
-const ChatSection = ({ objectKey, value }: ChatSectionProps) => {
+
+const ChatSection = ({ section, value }: ChatSectionProps) => {
   return (
     <OakFlex $flexDirection="column">
       <MemoizedReactMarkdownWithStyles
         lessonPlanSectionDescription={
-          lessonSectionTitlesAndMiniDescriptions[objectKey]?.description
+          lessonSectionTitlesAndMiniDescriptions[section]?.description
         }
-        markdown={`${sectionToMarkdown(objectKey, value)}`}
+        markdown={`${sectionToMarkdown(section, value)}`}
       />
       <OakFlex
         $gap="all-spacing-3"
@@ -27,23 +32,23 @@ const ChatSection = ({ objectKey, value }: ChatSectionProps) => {
         $position="relative"
         $display={["none", "flex"]}
       >
-        {objectKey === "additionalMaterials" && value === "None" ? (
+        {section === "additionalMaterials" && value === "None" ? (
           <AddAdditionalMaterialsButton
-            sectionTitle={sectionTitle(objectKey)}
-            sectionPath={objectKey}
+            sectionTitle={sectionTitle(section)}
+            sectionPath={section}
             sectionValue={value}
           />
         ) : (
           <ModifyButton
-            sectionTitle={sectionTitle(objectKey)}
-            sectionPath={objectKey}
+            sectionTitle={sectionTitle(section)}
+            sectionPath={section}
             sectionValue={value}
           />
         )}
 
         <FlagButton
-          sectionTitle={sectionTitle(objectKey)}
-          sectionPath={objectKey}
+          sectionTitle={sectionTitle(section)}
+          sectionPath={section}
           sectionValue={value}
         />
       </OakFlex>
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 0254d8ef4..2a98e3c3a 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
@@ -1,6 +1,7 @@
 import { useEffect, useRef, useState } from "react";
 
 import { getLastAssistantMessage } from "@oakai/aila/src/helpers/chat/getLastAssistantMessage";
+import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
 import type { AilaUserFlagType } from "@oakai/db";
 import { OakBox, OakP, OakRadioGroup } from "@oaknational/oak-components";
 import styled from "styled-components";
@@ -26,7 +27,7 @@ type FlagButtonOptions = typeof flagOptions;
 export type FlagButtonProps = Readonly<{
   sectionTitle: string;
   sectionPath: string;
-  sectionValue: Record<string, unknown> | string | Array<unknown>;
+  sectionValue: LessonPlanSectionWhileStreaming;
 }>;
 
 const FlagButton = ({
@@ -48,6 +49,25 @@ const FlagButton = ({
 
   const { mutateAsync } = trpc.chat.chatFeedback.flagSection.useMutation();
 
+  const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+  };
+
+  const prepareSectionValue = (
+    value: LessonPlanSectionWhileStreaming,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ): string | any[] | Record<string, unknown> => {
+    if (
+      typeof value === "string" ||
+      Array.isArray(value) ||
+      isPlainObject(value)
+    ) {
+      return value;
+    }
+    // For numbers or any other types, convert to string
+    return String(value);
+  };
+
   const flagSectionContent = async () => {
     if (selectedRadio && lastAssistantMessage) {
       const payload = {
@@ -56,7 +76,7 @@ const FlagButton = ({
         flagType: selectedRadio.enumValue,
         userComment: userFeedbackText,
         sectionPath,
-        sectionValue,
+        sectionValue: prepareSectionValue(sectionValue),
       };
       await mutateAsync(payload);
     }
@@ -93,7 +113,7 @@ const FlagButton = ({
           >
             {flagOptions.map((option) => (
               <FlagButtonFormItem
-                key={`flagbuttonformitem-${option.enumValue}`}
+                key={`flagButtonFormItem-${option.enumValue}`}
                 option={option}
                 setSelectedRadio={setSelectedRadio}
                 setDisplayTextBox={setDisplayTextBox}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.stories.tsx
index f34fcc4c9..322496291 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.stories.tsx
@@ -1,8 +1,7 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { userEvent, within } from "@storybook/test";
 
-import type { ChatContextProps } from "@/components/ContextProviders/ChatProvider";
-import { ChatContext } from "@/components/ContextProviders/ChatProvider";
+import { ChatDecorator } from "@/storybook/decorators/ChatDecorator";
 
 import DropDownSection from "./";
 
@@ -10,47 +9,42 @@ const MAX_INT32 = 2 ** 31 - 1;
 
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
-const ChatDecorator: Story["decorators"] = (Story, { parameters }) => (
-  <ChatContext.Provider
-    value={
-      {
-        id: "123",
-        lastModeration: null,
-        messages: [],
-        lessonPlan: {
-          title: "About Frogs",
-          keyStage: "Key Stage 2",
-          subject: "Science",
-          topic: "Amphibians",
-          basedOn: "Frogs in Modern Britain",
-          learningOutcome:
-            "To understand the importance of frogs in British society and culture",
-        },
-        ailaStreamingStatus: "Idle",
-        ...parameters.chatContext,
-      } as unknown as ChatContextProps
-    }
-  >
-    <Story />
-  </ChatContext.Provider>
-);
-
-const meta: Meta<typeof DropDownSection> = {
+const meta = {
   title: "Components/LessonPlan/DropDownSection",
   component: DropDownSection,
   tags: ["autodocs"],
   args: {
-    objectKey: "learningOutcome",
+    section: "learningOutcome",
     value:
       "I can explain the reasons why frogs are so important to British society and culture",
     documentContainerRef: { current: null },
     streamingTimeout: 0,
+    userHasCancelledAutoScroll: false,
+    sectionRefs: {},
+    showLessonMobile: false,
   },
   decorators: [ChatDecorator],
-};
+  parameters: {
+    chatContext: {
+      id: "123",
+      lastModeration: null,
+      messages: [],
+      lessonPlan: {
+        title: "About Frogs",
+        keyStage: "Key Stage 2",
+        subject: "Science",
+        topic: "Amphibians",
+        basedOn: { id: "testId", title: "Frogs in Modern Britain" },
+        learningOutcome:
+          "To understand the importance of frogs in British society and culture",
+      },
+      ailaStreamingStatus: "Idle",
+    },
+  },
+} satisfies Meta<typeof DropDownSection>;
 
 export default meta;
-type Story = StoryObj<typeof DropDownSection>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
@@ -89,7 +83,7 @@ export const Closed: Story = {
 
 export const AdditionalMaterials: Story = {
   args: {
-    objectKey: "additionalMaterials",
+    section: "additionalMaterials",
     value: "None",
   },
 };
@@ -116,7 +110,7 @@ export const ModifyAdditionalMaterials: Story = {
     },
   },
   args: {
-    objectKey: "additionalMaterials",
+    section: "additionalMaterials",
     value: "None",
   },
   play: async ({ canvasElement }) => {
diff --git a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.tsx b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.tsx
index aac7f06e6..15800276d 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/drop-down-section/index.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useRef, useState } from "react";
 
+import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
 import { camelCaseToSentenceCase } from "@oakai/core/src/utils/camelCaseConversion";
 import { OakBox, OakFlex, OakP } from "@oaknational/oak-components";
 import { equals } from "ramda";
@@ -15,7 +16,7 @@ import ChatSection from "./chat-section";
 const HALF_SECOND = 500;
 
 export type DropDownSectionProps = Readonly<{
-  objectKey: string;
+  section: LessonPlanKeys;
   sectionRefs: Record<string, React.MutableRefObject<HTMLDivElement | null>>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value: any;
@@ -26,7 +27,7 @@ export type DropDownSectionProps = Readonly<{
 }>;
 
 const DropDownSection = ({
-  objectKey,
+  section,
   sectionRefs,
   value,
   documentContainerRef,
@@ -35,7 +36,7 @@ const DropDownSection = ({
   streamingTimeout = HALF_SECOND,
 }: DropDownSectionProps) => {
   const sectionRef = useRef(null);
-  if (sectionRefs) sectionRefs[objectKey] = sectionRef;
+  if (sectionRefs) sectionRefs[section] = sectionRef;
   const [isOpen, setIsOpen] = useState(false);
   const [status, setStatus] = useState<"empty" | "isStreaming" | "isLoaded">(
     "empty",
@@ -56,7 +57,7 @@ const DropDownSection = ({
       setStatus("isStreaming");
 
       if (sectionRef && sectionHasFired === false && status === "isStreaming") {
-        if (objectKey && value) {
+        if (section && value) {
           function scrollToSection() {
             if (!userHasCancelledAutoScroll) {
               scrollToRef({
@@ -86,11 +87,12 @@ const DropDownSection = ({
     sectionRef,
     sectionHasFired,
     status,
-    objectKey,
+    section,
     setIsOpen,
     prevValue,
     documentContainerRef,
     userHasCancelledAutoScroll,
+    streamingTimeout,
   ]);
 
   return (
@@ -109,7 +111,7 @@ const DropDownSection = ({
 
         <FullWidthButton onClick={() => setIsOpen(!isOpen)} aria-label="toggle">
           <OakFlex $width="100%" $justifyContent="space-between">
-            <OakP $font="heading-6">{sectionTitle(objectKey)}</OakP>
+            <OakP $font="heading-6">{sectionTitle(section)}</OakP>
             <Icon icon={isOpen ? "chevron-up" : "chevron-down"} size="sm" />
           </OakFlex>
         </FullWidthButton>
@@ -118,7 +120,7 @@ const DropDownSection = ({
       {isOpen && (
         <div className="mt-12 w-full">
           {status === "isLoaded" ? (
-            <ChatSection objectKey={objectKey} value={value} />
+            <ChatSection section={section} value={value} />
           ) : (
             <Skeleton loaded={false} numberOfRows={1}>
               <p>Loading</p>
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 427042a61..b3ee39a57 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
@@ -1,3 +1,4 @@
+import type { LessonPlanSectionWhileStreaming } from "@oakai/aila/src/protocol/schema";
 import type { AilaUserModificationAction } from "@prisma/client";
 
 import ActionButtonWrapper from "./action-button-wrapper";
@@ -7,7 +8,7 @@ import type { FeedbackOption } from "./drop-down-form-wrapper";
 export type ModifyButtonProps = Readonly<{
   sectionTitle: string;
   sectionPath: string;
-  sectionValue: Record<string, unknown> | string | Array<unknown>;
+  sectionValue: LessonPlanSectionWhileStreaming;
 }>;
 
 const ModifyButton = ({
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 1506c7b4d..a9cf19bff 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
@@ -8,17 +8,18 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import { LessonPlanProgressDropdown } from "./LessonPlanProgressDropdown";
 
-const meta: Meta<typeof LessonPlanProgressDropdown> = {
+const meta = {
   title: "Components/LessonPlan/LessonPlanProgressDropdown",
   component: LessonPlanProgressDropdown,
   tags: ["autodocs"],
-};
+} satisfies Meta<typeof LessonPlanProgressDropdown>;
 
 export default meta;
-type Story = StoryObj<typeof LessonPlanProgressDropdown>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
+    isStreaming: false,
     lessonPlan: {
       // 1 (lesson details)
       title: "Introduction to Glaciation",
@@ -38,9 +39,9 @@ export const Default: Story = {
       learningOutcome: { current: null },
       learningCycles: { current: null },
       priorKnowledge: { current: null },
-      "cycle-1": { current: null },
-      "cycle-2": { current: null },
-      "cycle-3": { current: null },
+      cycle1: { current: null },
+      cycle2: { current: null },
+      cycle3: { current: null },
     },
     documentContainerRef: { current: null },
   },
@@ -49,6 +50,7 @@ export const Default: Story = {
 export const PartiallyCompleted: Story = {
   args: {
     ...Default.args,
+    isStreaming: true,
     lessonPlan: {
       // 1 (lesson details)
       title: "Introduction to Glaciation",
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 98f414d2e..218b19bbe 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,9 @@
 import React, { useState } from "react";
 
-import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type {
+  LessonPlanKeys,
+  LooseLessonPlan,
+} from "@oakai/aila/src/protocol/schema";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { Flex } from "@radix-ui/themes";
 
@@ -9,10 +12,12 @@ import { scrollToRef } from "@/utils/scrollToRef";
 
 import { useProgressForDownloads } from "../Chat/hooks/useProgressForDownloads";
 
-type LessonPlanProgressDropdownProps = Readonly<{
+export type LessonPlanProgressDropdownProps = Readonly<{
   lessonPlan: LooseLessonPlan;
   isStreaming: boolean;
-  sectionRefs: Record<string, React.MutableRefObject<HTMLDivElement | null>>;
+  sectionRefs: Partial<
+    Record<LessonPlanKeys, React.MutableRefObject<HTMLDivElement | null>>
+  >;
   documentContainerRef: React.MutableRefObject<HTMLDivElement | null>;
 }>;
 
@@ -61,10 +66,10 @@ export const LessonPlanProgressDropdown: React.FC<
                   disabled={!complete}
                   className="mb-7 flex gap-6"
                   onClick={() => {
-                    if (key === "cycles" && complete) {
-                      if (sectionRefs["cycle-1"]) {
+                    if (key === "cycle1" && complete) {
+                      if (sectionRefs["cycle1"]) {
                         scrollToRef({
-                          ref: sectionRefs["cycle-1"],
+                          ref: sectionRefs["cycle1"],
                           containerRef: documentContainerRef,
                         });
                       }
diff --git a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/MobileExportButtons.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/MobileExportButtons.stories.tsx
index b4dad8f06..42d1045d5 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/MobileExportButtons.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/MobileExportButtons.stories.tsx
@@ -1,61 +1,41 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
-import type { ChatContextProps } from "@/components/ContextProviders/ChatProvider";
-import { ChatContext } from "@/components/ContextProviders/ChatProvider";
-import { DemoContext } from "@/components/ContextProviders/Demo";
+import { chromaticParams } from "@/storybook/chromatic";
+import { ChatDecorator } from "@/storybook/decorators/ChatDecorator";
+import {
+  DemoDecorator,
+  demoParams,
+} from "@/storybook/decorators/DemoDecorator";
 
 import { MobileExportButtons } from "./MobileExportButtons";
 
-const ChatDecorator: Story["decorators"] = (Story, { parameters }) => (
-  <ChatContext.Provider
-    value={
-      {
-        id: "123",
-        ...parameters.chatContext,
-      } as unknown as ChatContextProps
-    }
-  >
-    <Story />
-  </ChatContext.Provider>
-);
-
-const DemoDecorator: Story["decorators"] = (Story, { parameters }) => (
-  <DemoContext.Provider
-    value={{
-      isDemoUser: false,
-      isSharingEnabled: true,
-      ...parameters.demoContext,
-    }}
-  >
-    <Story />
-  </DemoContext.Provider>
-);
-
-const meta: Meta<typeof MobileExportButtons> = {
+const meta = {
   title: "Components/LessonPlan/MobileExportButtons",
   component: MobileExportButtons,
   tags: ["autodocs"],
   decorators: [ChatDecorator, DemoDecorator],
   parameters: {
     viewport: {
-      defaultViewport: "mobile1",
+      defaultViewport: "mobile",
+    },
+    ...chromaticParams(["mobile"]),
+    ...demoParams({ isDemoUser: false }),
+    chatContext: {
+      id: "123",
     },
   },
   args: {
     closeMobileLessonPullOut: () => {},
   },
-};
+} satisfies Meta<typeof MobileExportButtons>;
 
 export default meta;
-type Story = StoryObj<typeof MobileExportButtons>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};
 
 export const SharingDisabled: Story = {
   parameters: {
-    demoContext: {
-      isDemoUser: true,
-      isSharingEnabled: false,
-    },
+    ...demoParams({ isDemoUser: true, isSharingEnabled: false }),
   },
 };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.stories.tsx
index 10df1a045..fc59a9a17 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.stories.tsx
@@ -1,38 +1,13 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
-import type { ChatContextProps } from "@/components/ContextProviders/ChatProvider";
-import { ChatContext } from "@/components/ContextProviders/ChatProvider";
-import { DemoContext } from "@/components/ContextProviders/Demo";
+import { ChatDecorator } from "@/storybook/decorators/ChatDecorator";
+import {
+  DemoDecorator,
+  demoParams,
+} from "@/storybook/decorators/DemoDecorator";
 
 import ExportButtons from "./";
 
-const ChatDecorator: Story["decorators"] = (Story, { parameters }) => (
-  <ChatContext.Provider
-    value={
-      {
-        id: "123",
-        isStreaming: false,
-        lessonPlan: {},
-        ...parameters.chatContext,
-      } as unknown as ChatContextProps
-    }
-  >
-    <Story />
-  </ChatContext.Provider>
-);
-
-const DemoDecorator: Story["decorators"] = (Story, { parameters }) => (
-  <DemoContext.Provider
-    value={{
-      isDemoUser: false,
-      isSharingEnabled: true,
-      ...parameters.demoContext,
-    }}
-  >
-    <Story />
-  </DemoContext.Provider>
-);
-
 const meta: Meta<typeof ExportButtons> = {
   title: "Components/LessonPlan/ExportButtons",
   component: ExportButtons,
@@ -42,10 +17,18 @@ const meta: Meta<typeof ExportButtons> = {
     sectionRefs: {},
     documentContainerRef: { current: null },
   },
+  parameters: {
+    chatContext: {
+      id: "123",
+      isStreaming: false,
+      lessonPlan: {},
+    },
+    ...demoParams({ isDemoUser: false }),
+  },
 };
 
 export default meta;
-type Story = StoryObj<typeof ExportButtons>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};
 
@@ -59,9 +42,6 @@ export const IsStreaming: Story = {
 
 export const SharingDisabled: Story = {
   parameters: {
-    demoContext: {
-      isDemoUser: true,
-      isSharingEnabled: false,
-    },
+    ...demoParams({ isDemoUser: true, isSharingEnabled: false }),
   },
 };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.tsx b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.tsx
index 671e9ee56..e639b2dc1 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/export-buttons/index.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
 import { OakSmallSecondaryButton } from "@oaknational/oak-components";
 import Link from "next/link";
 
@@ -11,7 +12,9 @@ import { useDialog } from "../../DialogContext";
 import { LessonPlanProgressDropdown } from "./LessonPlanProgressDropdown";
 
 export type ExportButtonsProps = Readonly<{
-  sectionRefs: Record<string, React.MutableRefObject<HTMLDivElement | null>>;
+  sectionRefs: Partial<
+    Record<LessonPlanKeys, React.MutableRefObject<HTMLDivElement | null>>
+  >;
   documentContainerRef: React.MutableRefObject<HTMLDivElement | null>;
 }>;
 
@@ -26,7 +29,7 @@ const ExportButtons = ({
   const demo = useDemoUser();
 
   return (
-    <div className=" sticky left-0 right-10 top-26 z-10 mt-26 hidden bg-white p-14 px-24 shadow-md sm:block">
+    <div className="sticky left-0 right-10 top-26 z-10 mt-26 hidden bg-white p-14 px-24 shadow-md sm:block">
       <div className="flex flex-col">
         <div className="flex items-center space-x-14">
           <LessonPlanProgressDropdown
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 8d7b547d3..e6df42f91 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
@@ -3,14 +3,14 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import { GuidanceRequired } from "./guidance-required";
 
-const meta: Meta<typeof GuidanceRequired> = {
+const meta = {
   title: "Components/Chat/GuidanceRequired",
   component: GuidanceRequired,
   tags: ["autodocs"],
-};
+} satisfies Meta<typeof GuidanceRequired>;
 
 export default meta;
-type Story = StoryObj<typeof GuidanceRequired>;
+type Story = StoryObj<typeof meta>;
 
 const mockModeration: PersistedModerationBase = {
   id: "moderated",
@@ -23,18 +23,19 @@ export const Default: Story = {
   },
 };
 
-export const CustomClass: Story = {
-  args: {
-    moderation: mockModeration,
-    className: "custom-class",
-  },
-};
-
-export const Safe: Story = {
+export const NoModeration: Story = {
   args: {
     moderation: {
       id: "safe",
       categories: [],
     },
   },
+  decorators: [
+    (Story) => (
+      <>
+        <Story />
+        <p>(Nothing should render here)</p>
+      </>
+    ),
+  ],
 };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/header.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/header.stories.tsx
new file mode 100644
index 000000000..7e39d249b
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/header.stories.tsx
@@ -0,0 +1,59 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { chromaticParams } from "@/storybook/chromatic";
+import {
+  DemoDecorator,
+  demoParams,
+} from "@/storybook/decorators/DemoDecorator";
+
+import { Header } from "./header";
+
+const meta = {
+  title: "Components/Layout/ChatHeader",
+  component: Header,
+  tags: ["autodocs"],
+  decorators: [DemoDecorator],
+  parameters: {
+    layout: "fullscreen",
+    docs: {
+      story: {
+        height: "150px",
+      },
+    },
+    ...demoParams({ isDemoUser: false }),
+  },
+} satisfies Meta<typeof Header>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {},
+};
+
+export const DemoUser: Story = {
+  args: {},
+  parameters: {
+    ...demoParams({
+      isDemoUser: true,
+      demo: {
+        appSessionsPerMonth: 3,
+        appSessionsRemaining: 2,
+      },
+    }),
+    ...chromaticParams(["desktop", "desktop-wide"]),
+  },
+};
+
+export const DemoLoading: Story = {
+  args: {},
+  parameters: {
+    ...demoParams({
+      isDemoUser: true,
+      demo: {
+        appSessionsPerMonth: 3,
+        appSessionsRemaining: undefined,
+      },
+    }),
+  },
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/header.tsx b/apps/nextjs/src/components/AppComponents/Chat/header.tsx
index 24ee90044..3fdf0b708 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/header.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/header.tsx
@@ -22,7 +22,7 @@ import { OpenSideBarButton } from "./open-side-bar-button";
 import { UserOrLogin } from "./user-or-login";
 
 export function Header() {
-  const demo = useDemoUser();
+  const { isDemoUser, demo } = useDemoUser();
 
   // Check whether clerk metadata has loaded to prevent the banner from flashing
   const clerkMetadata = useClerkDemoMetadata();
@@ -36,7 +36,7 @@ export function Header() {
       $zIndex={"banner"}
       $width={"100%"}
     >
-      {clerkMetadata.isSet && demo.isDemoUser && (
+      {clerkMetadata.isSet && isDemoUser && (
         <OakFlex
           $alignItems={"center"}
           $bb={"border-solid-m"}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
index d935e040c..f50163802 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
@@ -1,6 +1,6 @@
 import type { FC } from "react";
-import React, { memo } from "react";
-import type { Options } from "react-markdown";
+import React, { memo, useMemo } from "react";
+import type { Components, Options } from "react-markdown";
 import ReactMarkdown from "react-markdown";
 
 import * as Tooltip from "@radix-ui/react-tooltip";
@@ -24,110 +24,112 @@ export type ReactMarkdownWithStylesProps = Readonly<{
   className?: string;
 }>;
 
+// This could do with further refactoring to make it more readable
+const createComponents = (
+  className?: string,
+  lessonPlanSectionDescription?: string,
+): Partial<Components> => ({
+  li: ({ children }) => (
+    <li className={cn("marker:text-black", className)}>{children}</li>
+  ),
+  p: ({ children }) => (
+    <p className={cn("mb-7 last:mb-0", className)}>{children}</p>
+  ),
+  h1: ({ children }) => (
+    <Flex align="center" gap="3" className="mt-20">
+      <Box>
+        <h2 className="mb-0 mt-0 text-xl font-bold">{children}</h2>
+      </Box>
+      {!!lessonPlanSectionDescription && (
+        <Tooltip.Provider delayDuration={0}>
+          <Tooltip.Root>
+            <Tooltip.Trigger asChild>
+              <Box className="mb-0 mt-0 ">
+                <button className="my-0 flex h-[24px] w-[24px] items-center justify-center overflow-hidden rounded-full bg-black p-4 ">
+                  <span className=" p-3 text-xs text-white">i</span>
+                </button>
+              </Box>
+            </Tooltip.Trigger>
+            <Tooltip.Portal>
+              <Tooltip.Content
+                className="max-w-[300px] rounded-lg bg-black p-7 text-center text-sm text-white"
+                sideOffset={5}
+              >
+                {lessonPlanSectionDescription}
+                <Tooltip.Arrow className="TooltipArrow" />
+              </Tooltip.Content>
+            </Tooltip.Portal>
+          </Tooltip.Root>
+        </Tooltip.Provider>
+      )}
+    </Flex>
+  ),
+  code: (props) => {
+    const {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      node,
+      className,
+      children,
+      inline,
+      ...restProps
+    } = props as {
+      node?: React.ReactNode;
+      inline?: boolean;
+      className?: string;
+      children?: React.ReactNode;
+    };
+    if (children && Array.isArray(children) && children.length) {
+      if (children[0] == "▍") {
+        return <span className="mt-5 animate-pulse cursor-default">▍</span>;
+      }
+
+      children[0] = (children[0] as string).replace("`▍`", "▍");
+    }
+
+    const match = /language-(\w+)/.exec(className ?? "");
+
+    if (inline) {
+      return (
+        <code className={className} {...restProps}>
+          {children}
+        </code>
+      );
+    }
+
+    return (
+      <CodeBlock
+        language={match?.[1] ?? ""}
+        value={String(children).replace(/\n$/, "")}
+        {...restProps}
+      />
+    );
+  },
+  a: ({ children, href }) => {
+    const isExternal = href?.startsWith("http");
+    const tags = isExternal
+      ? { target: "_blank", rel: "noopener noreferrer" }
+      : {};
+    return (
+      <a href={href} {...tags}>
+        {children}
+      </a>
+    );
+  },
+});
+
 export const MemoizedReactMarkdownWithStyles = ({
   markdown,
   lessonPlanSectionDescription,
   className,
 }: ReactMarkdownWithStylesProps) => {
+  const components: Partial<Components> = useMemo(() => {
+    return createComponents(className, lessonPlanSectionDescription);
+  }, [className, lessonPlanSectionDescription]);
   return (
     <MemoizedReactMarkdown
       className="prose break-words dark:prose-invert prose-p:leading-relaxed prose-pre:p-0"
       remarkPlugins={[remarkGfm]}
-      components={{
-        li({ children }) {
-          return (
-            <li className={cn("marker:text-black", className)}>{children}</li>
-          );
-        },
-        p({ children }) {
-          return <p className={cn("mb-7 last:mb-0", className)}>{children}</p>;
-        },
-        h1({ children }) {
-          return (
-            <Flex align="center" gap="3" className="mt-20">
-              <Box>
-                <h2 className="mb-0 mt-0 text-xl font-bold">{children}</h2>
-              </Box>
-              {!!lessonPlanSectionDescription && (
-                <Tooltip.Provider delayDuration={0}>
-                  <Tooltip.Root>
-                    <Tooltip.Trigger asChild>
-                      <Box className="mb-0 mt-0 ">
-                        <button className="my-0 flex h-[24px] w-[24px] items-center justify-center overflow-hidden rounded-full bg-black p-4 ">
-                          <span className=" p-3 text-xs text-white">i</span>
-                        </button>
-                      </Box>
-                    </Tooltip.Trigger>
-                    <Tooltip.Portal>
-                      <Tooltip.Content
-                        className="max-w-[300px] rounded-lg bg-black p-7 text-center text-sm text-white"
-                        sideOffset={5}
-                      >
-                        {lessonPlanSectionDescription}
-                        <Tooltip.Arrow className="TooltipArrow" />
-                      </Tooltip.Content>
-                    </Tooltip.Portal>
-                  </Tooltip.Root>
-                </Tooltip.Provider>
-              )}
-            </Flex>
-          );
-        },
-        code(props) {
-          const {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            node,
-            className,
-            children,
-            inline,
-            ...restProps
-          } = props as {
-            node?: React.ReactNode;
-            inline?: boolean;
-            className?: string;
-            children?: React.ReactNode;
-          };
-          if (children && Array.isArray(children) && children.length) {
-            if (children[0] == "▍") {
-              return (
-                <span className="mt-5 animate-pulse cursor-default">▍</span>
-              );
-            }
-
-            children[0] = (children[0] as string).replace("`▍`", "▍");
-          }
-
-          const match = /language-(\w+)/.exec(className || "");
-
-          if (inline) {
-            return (
-              <code className={className} {...restProps}>
-                {children}
-              </code>
-            );
-          }
-
-          return (
-            <CodeBlock
-              key={Math.random()}
-              language={(match && match[1]) || ""}
-              value={String(children).replace(/\n$/, "")}
-              {...restProps}
-            />
-          );
-        },
-        a({ children, href }) {
-          const isExternal = href?.startsWith("http");
-          const tags = isExternal
-            ? { target: "_blank", rel: "noopener noreferrer" }
-            : {};
-          return (
-            <a href={href} {...tags}>
-              {children}
-            </a>
-          );
-        },
-      }}
+      components={components}
     >
       {markdown}
     </MemoizedReactMarkdown>
diff --git a/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx b/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx
index 04e600d87..b2369b0ca 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/prompt-form.tsx
@@ -17,8 +17,7 @@ import type { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
 export interface PromptFormProps
   extends Pick<UseChatHelpers, "input" | "setInput"> {
   onSubmit: (value: string) => void;
-  isEmptyScreen: boolean;
-  placeholder?: string;
+  hasMessages: boolean;
   ailaStreamingStatus: AilaStreamingStatus;
   queuedUserAction?: string | null;
   queueUserAction?: (action: string) => void;
@@ -29,8 +28,7 @@ export function PromptForm({
   onSubmit,
   input,
   setInput,
-  isEmptyScreen,
-  placeholder,
+  hasMessages,
   queuedUserAction,
   queueUserAction,
 }: Readonly<PromptFormProps>) {
@@ -93,8 +91,8 @@ export function PromptForm({
           value={input}
           onChange={(e) => setInput(e.target.value)}
           placeholder={handlePlaceholder(
-            isEmptyScreen,
-            queuedUserAction ?? placeholder,
+            hasMessages,
+            queuedUserAction ?? undefined,
           )}
           spellCheck={false}
           className="min-h-[60px] w-full resize-none bg-transparent px-10 py-[1.3rem] text-base focus-within:outline-none"
@@ -119,11 +117,14 @@ export function PromptForm({
   );
 }
 
-function handlePlaceholder(isEmptyScreen: boolean, placeholder?: string) {
-  if (placeholder && !["continue", "regenerate"].includes(placeholder)) {
-    return placeholder;
+function handlePlaceholder(hasMessages: boolean, queuedUserAction?: string) {
+  if (
+    queuedUserAction &&
+    !["continue", "regenerate"].includes(queuedUserAction)
+  ) {
+    return queuedUserAction;
   }
-  return !isEmptyScreen
-    ? "Type a subject, key stage and title"
-    : "Type your response here";
+  return hasMessages
+    ? "Type your response here"
+    : "Type a subject, key stage and title";
 }
diff --git a/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.stories.tsx
index b970589d9..772bee5bd 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/sidebar-actions.stories.tsx
@@ -3,17 +3,17 @@ import { within } from "@storybook/test";
 
 import { SidebarActions } from "./sidebar-actions";
 
-const meta: Meta<typeof SidebarActions> = {
+const meta = {
   title: "Components/Sidebar/Actions",
   component: SidebarActions,
   parameters: {
     layout: "centered",
   },
   tags: ["autodocs"],
-};
+} satisfies Meta<typeof SidebarActions>;
 
 export default meta;
-type Story = StoryObj<typeof SidebarActions>;
+type Story = StoryObj<typeof meta>;
 
 const mockChat = {
   id: "1",
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
index 9ce6ee098..5846852bc 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
@@ -41,7 +41,7 @@ export interface ButtonProps
   readonly asChild?: boolean;
 }
 
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+const Button = React.forwardRef<HTMLButtonElement, Readonly<ButtonProps>>(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
     const Comp = asChild ? Slot : "button";
     return (
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
index 1633f7d0c..fc4fcfa01 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
@@ -18,11 +18,11 @@ interface Props {
   value: string;
 }
 
-interface languageMap {
+interface LanguageMap {
   [key: string]: string | undefined;
 }
 
-const programmingLanguages: languageMap = {
+const programmingLanguages: LanguageMap = {
   javascript: ".js",
   python: ".py",
   java: ".java",
@@ -65,7 +65,7 @@ const CodeBlock: FC<Props> = memo(({ language, value }) => {
     if (typeof window === "undefined") {
       return;
     }
-    const fileExtension = programmingLanguages[language] || ".file";
+    const fileExtension = programmingLanguages[language] ?? ".file";
     const suggestedFileName = `file-${generateRandomString(
       3,
       true,
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/icons.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/icons.tsx
index bb794b380..ba8d499f1 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/icons.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/icons.tsx
@@ -4,7 +4,10 @@ import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
-function IconOpenAI({ className, ...props }: React.ComponentProps<"svg">) {
+function IconOpenAI({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       fill="currentColor"
@@ -20,7 +23,10 @@ function IconOpenAI({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconArrowDown({ className, ...props }: React.ComponentProps<"svg">) {
+function IconArrowDown({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -34,7 +40,10 @@ function IconArrowDown({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconArrowRight({ className, ...props }: React.ComponentProps<"svg">) {
+function IconArrowRight({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -48,7 +57,10 @@ function IconArrowRight({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconUser({ className, ...props }: React.ComponentProps<"svg">) {
+function IconUser({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -62,7 +74,10 @@ function IconUser({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconPlus({ className, ...props }: React.ComponentProps<"svg">) {
+function IconPlus({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -76,7 +91,10 @@ function IconPlus({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconArrowElbow({ className, ...props }: React.ComponentProps<"svg">) {
+function IconArrowElbow({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -90,7 +108,10 @@ function IconArrowElbow({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconSpinner({ className, ...props }: React.ComponentProps<"svg">) {
+function IconSpinner({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -104,7 +125,10 @@ function IconSpinner({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconMessage({ className, ...props }: React.ComponentProps<"svg">) {
+function IconMessage({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -118,7 +142,10 @@ function IconMessage({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconTrash({ className, ...props }: React.ComponentProps<"svg">) {
+function IconTrash({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -132,7 +159,10 @@ function IconTrash({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconRefresh({ className, ...props }: React.ComponentProps<"svg">) {
+function IconRefresh({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -146,7 +176,10 @@ function IconRefresh({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconStop({ className, ...props }: React.ComponentProps<"svg">) {
+function IconStop({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -160,7 +193,10 @@ function IconStop({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconSidebar({ className, ...props }: React.ComponentProps<"svg">) {
+function IconSidebar({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -174,7 +210,10 @@ function IconSidebar({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconCopy({ className, ...props }: React.ComponentProps<"svg">) {
+function IconCopy({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -188,7 +227,10 @@ function IconCopy({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconCheck({ className, ...props }: React.ComponentProps<"svg">) {
+function IconCheck({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -202,7 +244,10 @@ function IconCheck({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconDownload({ className, ...props }: React.ComponentProps<"svg">) {
+function IconDownload({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -216,7 +261,10 @@ function IconDownload({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconClose({ className, ...props }: React.ComponentProps<"svg">) {
+function IconClose({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -230,7 +278,10 @@ function IconClose({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconEdit({ className, ...props }: React.ComponentProps<"svg">) {
+function IconEdit({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -250,7 +301,10 @@ function IconEdit({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconShare({ className, ...props }: React.ComponentProps<"svg">) {
+function IconShare({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -264,7 +318,10 @@ function IconShare({ className, ...props }: React.ComponentProps<"svg">) {
   );
 }
 
-function IconUsers({ className, ...props }: React.ComponentProps<"svg">) {
+function IconUsers({
+  className,
+  ...props
+}: Readonly<React.ComponentProps<"svg">>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/textarea.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/textarea.tsx
index e4eb3ebb2..4878582fd 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/textarea.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/textarea.tsx
@@ -2,23 +2,21 @@ import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
-interface TextareaProps
-  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
-
-const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
-  ({ className, ...props }, ref) => {
-    return (
-      <textarea
-        className={cn(
-          "flex min-h-[80px] w-full rounded-md border border-input bg-transparent px-9 py-7 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
-          className,
-        )}
-        ref={ref}
-        {...props}
-      />
-    );
-  },
-);
+const Textarea = React.forwardRef<
+  HTMLTextAreaElement,
+  React.TextareaHTMLAttributes<HTMLTextAreaElement>
+>(({ className, ...props }, ref) => {
+  return (
+    <textarea
+      className={cn(
+        "flex min-h-[80px] w-full rounded-md border border-input bg-transparent px-9 py-7 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+        className,
+      )}
+      ref={ref}
+      {...props}
+    />
+  );
+});
 Textarea.displayName = "Textarea";
 
 export { Textarea };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx b/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx
index 940a8f76d..f1cd37291 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx
@@ -10,17 +10,15 @@ export function UserOrLogin() {
     return <></>;
   }
   return (
-    <>
-      <div className="flex items-center sm:ml-8">
-        <SignedIn>
-          <UserButton />
-        </SignedIn>
-        <SignedOut>
-          <Button variant="link" asChild className="-ml-7">
-            <Link href="/sign-in?callbackUrl=/">Log in</Link>
-          </Button>
-        </SignedOut>
-      </div>
-    </>
+    <div className="flex items-center sm:ml-8">
+      <SignedIn>
+        <UserButton />
+      </SignedIn>
+      <SignedOut>
+        <Button variant="link" asChild className="-ml-7">
+          <Link href="/sign-in?callbackUrl=/">Log in</Link>
+        </Button>
+      </SignedOut>
+    </div>
   );
 }
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
index b5a039e53..c62dced01 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
@@ -54,7 +54,7 @@ const KeyStageAndSubjectPicker = ({
   useEffect(() => {
     const havePickedUnavailableSubject =
       selectedSubject && !allowedSubjects.includes(selectedSubject);
-    if (havePickedUnavailableSubject || !selectedSubject) {
+    if (havePickedUnavailableSubject ?? !selectedSubject) {
       const firstAvailableSubject = allowedSubjects[0];
 
       if (selectedSubject !== firstAvailableSubject) {
diff --git a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
index 22366e46a..c77be1132 100644
--- a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
+++ b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
@@ -46,39 +46,46 @@ export const ModerationFeedbackForm = ({
         />
       </div>
       <Dialog.Close />
-      <>
-        <div className="flex flex-col gap-8">
-          <Dialog.Title>
-            <span className="font-bold">Guidance required</span>
-          </Dialog.Title>
-          <Dialog.Description>
-            <span>
-              Contains{" "}
-              {moderation.categories
-                .map(moderationSlugToDescription)
-                .join(", ")}
-              . Check content carefully. If you have feedback on this guidance,
-              please provide details below.
-            </span>
-          </Dialog.Description>
-        </div>
-        <form onSubmit={onSubmit}>
-          <Textarea
-            className="min-h-30 w-full resize-none rounded border border-gray-600 bg-transparent px-10 py-[0.6rem] text-base placeholder-gray-700 focus-within:outline-none"
-            onChange={(e) => setComment(e.target.value)}
-            value={comment}
-            placeholder="Your feedback"
-          />
-        </form>
-        <div className="flex w-full justify-between gap-7">
-          <ChatButton variant="text-link" onClick={closeModal}>
-            Back to lesson
-          </ChatButton>
-          <ChatButton variant="primary" onClick={onSubmit} disabled={!isValid}>
-            Submit feedback
-          </ChatButton>
-        </div>
-      </>
+      <div className="flex flex-col gap-8">
+        <Dialog.Title>
+          <span className="font-bold">Guidance required</span>
+        </Dialog.Title>
+        <Dialog.Description>
+          <span>
+            Contains{" "}
+            {moderation.categories.map(moderationSlugToDescription).join(", ")}.
+            Check content carefully. If you have feedback on this guidance,
+            please provide details below.
+          </span>
+        </Dialog.Description>
+      </div>
+      <form
+        onSubmit={(e) => {
+          e.preventDefault();
+          void onSubmit();
+        }}
+      >
+        <Textarea
+          className="min-h-30 w-full resize-none rounded border border-gray-600 bg-transparent px-10 py-[0.6rem] text-base placeholder-gray-700 focus-within:outline-none"
+          onChange={(e) => setComment(e.target.value)}
+          value={comment}
+          placeholder="Your feedback"
+        />
+      </form>
+      <div className="flex w-full justify-between gap-7">
+        <ChatButton variant="text-link" onClick={closeModal}>
+          Back to lesson
+        </ChatButton>
+        <ChatButton
+          variant="primary"
+          onClick={() => {
+            void onSubmit();
+          }}
+          disabled={!isValid}
+        >
+          Submit feedback
+        </ChatButton>
+      </div>
     </div>
   );
 };
diff --git a/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx b/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx
index 27bea2d78..64d30b136 100644
--- a/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx
+++ b/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx
@@ -1,4 +1,19 @@
+import { useEffect, useState } from "react";
+
 const GetInTouchBox = () => {
+  const [isFirstRender, setIsFirstRender] = useState(true);
+  useEffect(() => {
+    if (isFirstRender) {
+      setIsFirstRender(false);
+    }
+  }, [isFirstRender]);
+
+  // Cloudflare has a script to obfuscate emails in the rendered page
+  // Our CSP policy is blocking it from activating, so we can simulate it ourselves
+  const email = isFirstRender
+    ? "/cdn-cgi/l/email-protection"
+    : "mailto:help@thenational.academy";
+
   return (
     <div className="flex flex-col items-center gap-14 rounded bg-lavender30 p-19 sm:flex-row">
       <div>
@@ -27,14 +42,11 @@ const GetInTouchBox = () => {
         </svg>
       </div>
       <p>
-        Can’t find what you need?{" "}
-        <a
-          href="mailto:help@thenational.academy"
-          className="text-blue underline"
-        >
+        {"Can’t find what you need? "}
+        <a href={email} className="text-blue underline">
           Get in touch
-        </a>{" "}
-        , we’d be happy to help.
+        </a>
+        {", we’d be happy to help."}
       </p>
     </div>
   );
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx
index 3b3c7869c..166eb5d95 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/ErrorBox.tsx
@@ -1,3 +1,5 @@
+import type { JSX } from "react";
+
 import type { Responsive } from "@radix-ui/themes";
 import { Box } from "@radix-ui/themes";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
index 22661d048..1f1f217e1 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
@@ -133,7 +133,7 @@ const Hero = ({
                   if (questionsWrapper) {
                     const { top } = questionsWrapper.getBoundingClientRect();
                     window.scrollTo({
-                      top: top + window.pageYOffset - 200,
+                      top: top + window.scrollY - 200,
                       behavior: "smooth",
                     });
                   }
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
index 23a5ef2bc..ec2da0e8e 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
@@ -41,7 +41,7 @@ const QuizContent = ({
     potentialNewQuestions,
     isLoading: suggestedQuestionsLoading,
     hasError: suggestedQuestionsHasError,
-    setPotentialNewQuestion,
+    setPotentialNewQuestions,
   } = useSuggestedQuestions({
     state,
     dispatch,
@@ -85,7 +85,7 @@ const QuizContent = ({
           potentialNewQuestions={potentialNewQuestions}
           dispatch={dispatch}
           suggestedQuestionsGeneration={suggestedQuestionsGeneration}
-          setPotentialNewQuestions={setPotentialNewQuestion}
+          setPotentialNewQuestions={setPotentialNewQuestions}
           questionsWrapperRef={questionsWrapperRef}
           questionRefs={questionRefs}
         />
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
index ff0ab3fd5..d6ce17e6c 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
@@ -47,7 +47,7 @@ const QuizDesignerPageContent = ({
     potentialNewQuestions,
     isLoading: suggestedQuestionsLoading,
     hasError: suggestedQuestionsHasError,
-    setPotentialNewQuestion,
+    setPotentialNewQuestions,
   } = useSuggestedQuestions({
     state,
     dispatch,
@@ -101,7 +101,7 @@ const QuizDesignerPageContent = ({
               suggestedQuestionsHasError={suggestedQuestionsHasError}
               potentialNewQuestions={potentialNewQuestions}
               dispatch={dispatch}
-              setPotentialNewQuestions={setPotentialNewQuestion}
+              setPotentialNewQuestions={setPotentialNewQuestions}
               suggestedQuestionsGeneration={suggestedQuestionsGeneration}
               questionRefs={questionRefs}
               questionsWrapperRef={questionsWrapperRef}
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
index cd739f83d..83a17da02 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
@@ -41,42 +41,37 @@ const Answers = ({
   const [userIsEditing, setUserIsEditing] = useState(false);
 
   return (
-    <>
-      <Box>
-        {!isLoading && (
-          <>
-            {questionRow.answers.map((answer, answerIdx) => {
-              return (
-                <Skeleton loaded={true} key={answer.value}>
-                  <Flex direction="row" className="w-full">
-                    <Box className="h-fit w-fit" mr="3" mt="2">
-                      <Box className="flex scale-75 items-center justify-center rounded-full bg-pupilsHighlight p-6">
-                        <Icon icon="tick" size="sm" />
-                      </Box>
-                    </Box>
-                    <Box className="w-full max-w-[90%]">
-                      <Answer
-                        setUserIsEditing={setUserIsEditing}
-                        questionIdx={questionIdx}
-                        questionRow={questionRow}
-                        state={state}
-                        isLoading={isLoading}
-                        userIsEditing={userIsEditing}
-                        answerIdx={answerIdx}
-                        dispatch={dispatch}
-                        answer={answer}
-                      />
-                    </Box>
-                  </Flex>
-                </Skeleton>
-              );
-            })}
-          </>
-        )}
+    <Box>
+      {!isLoading &&
+        questionRow.answers.map((answer, answerIdx) => {
+          return (
+            <Skeleton loaded={true} key={answer.value}>
+              <Flex direction="row" className="w-full">
+                <Box className="h-fit w-fit" mr="3" mt="2">
+                  <Box className="flex scale-75 items-center justify-center rounded-full bg-pupilsHighlight p-6">
+                    <Icon icon="tick" size="sm" />
+                  </Box>
+                </Box>
+                <Box className="w-full max-w-[90%]">
+                  <Answer
+                    setUserIsEditing={setUserIsEditing}
+                    questionIdx={questionIdx}
+                    questionRow={questionRow}
+                    state={state}
+                    isLoading={isLoading}
+                    userIsEditing={userIsEditing}
+                    answerIdx={answerIdx}
+                    dispatch={dispatch}
+                    answer={answer}
+                  />
+                </Box>
+              </Flex>
+            </Skeleton>
+          );
+        })}
 
-        {hasError && error && <GenerationErrorBox error={error} />}
-      </Box>
-    </>
+      {hasError && error && <GenerationErrorBox error={error} />}
+    </Box>
   );
 };
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
index 9fc978685..b60358ca2 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+// TODO - if we are maintaining the quiz designer, check the hook dependencies
 import type { Dispatch } from "react";
 import { useCallback, useState } from "react";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
index 13b0272ef..9a62ef498 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
@@ -76,13 +76,13 @@ const Question = ({
   const medianTimeTakenForPrompt =
     promptTimings.data?.["median-generation-total-duration-ms"];
 
-  const requestAnswersAndDistractorGeneration = useCallback(() => {
+  const requestAnswersAndDistractorGeneration = useCallback(async () => {
     const lastGeneration = [
       ...questionRow.answers,
       ...questionRow.distractors,
     ].find((answer) => Boolean(answer.lastGenerationId));
 
-    quizRequestGeneration({
+    await quizRequestGeneration({
       state,
       questionRow,
       requestGeneration,
@@ -101,7 +101,7 @@ const Question = ({
       onSubmit={(e) => {
         e.preventDefault();
         if (canGenerate) {
-          requestAnswersAndDistractorGeneration();
+          void requestAnswersAndDistractorGeneration();
         }
       }}
       className="w-full"
@@ -146,7 +146,7 @@ const Question = ({
                    * regenerate all prompt currently
                    */
                   if (canGenerate) {
-                    requestAnswersAndDistractorGeneration();
+                    void requestAnswersAndDistractorGeneration();
                   }
                 }}
                 disabled={!canGenerate}
@@ -161,7 +161,7 @@ const Question = ({
                 buttonText="Generate answers & distractors"
                 onClick={() => {
                   if (canGenerate) {
-                    requestAnswersAndDistractorGeneration();
+                    void requestAnswersAndDistractorGeneration();
                     suggestedQuestionsGeneration();
                   }
                 }}
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
index 73db3051e..53842f1f2 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
@@ -79,7 +79,7 @@ const SuggestedLessonCard = ({
                 if (questionRef) {
                   const { top } = questionRef.getBoundingClientRect();
                   window.scrollTo({
-                    top: top + window.pageYOffset - 200,
+                    top: top + window.scrollY - 200,
                     behavior: "smooth",
                   });
                 }
diff --git a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
index 23e2b08be..d42e514fc 100644
--- a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
@@ -23,10 +23,10 @@ function GenerationInputAndText({
    * instead of on every key-press. It also allows for undoing on closing "edit
    * mode" by setting inputValue back to answer.value
    */
-  const [inputValue, setInputValue] = useState(item.value || "");
+  const [inputValue, setInputValue] = useState(item.value ?? "");
 
   useEffect(() => {
-    setInputValue(item.value || "");
+    setInputValue(item.value ?? "");
   }, [item.value]);
 
   return (
diff --git a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
index e8727e486..52870af67 100644
--- a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
@@ -121,10 +121,10 @@ export const DownloadButton = ({
         </Link>
         <button
           className="flex w-full items-center  justify-start gap-15 hover:underline sm:hidden"
-          onClick={async () => {
+          onClick={() => {
             const lessonTitle = lesson.title;
             if (!lessonTitle) return;
-            mutateAsync({
+            void mutateAsync({
               lessonTitle,
               title,
               link,
@@ -150,10 +150,14 @@ export const DownloadButton = ({
       </div>
     );
   }
+
+  const downloadButtonClasses = downloadAvailable
+    ? `border-opacity-100`
+    : ` border-opacity-40`;
   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 ${downloadButtonClasses}`}
         onClick={() => onClick()}
         disabled={!downloadAvailable}
         data-testid={dataTestId}
diff --git a/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx b/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx
index 20a0efeaa..82bf37e70 100644
--- a/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx
@@ -133,9 +133,9 @@ export const AnalyticsProvider: React.FC<AnalyticsProviderProps> = ({
   avoOptions,
   bootstrappedFeatures,
 }) => {
-  const [hubspotScriptLoaded, setHubspotScriptLoadedFn] = useState(false);
-  const setHubspotScriptLoaded = useCallback(() => {
-    setHubspotScriptLoadedFn(true);
+  const [hubspotScriptLoaded, setHubspotScriptLoaded] = useState(false);
+  const setHubspotScriptLoadedOnce = useCallback(() => {
+    setHubspotScriptLoaded(true);
   }, []);
 
   /**
@@ -285,7 +285,10 @@ export const AnalyticsProvider: React.FC<AnalyticsProviderProps> = ({
   return (
     <analyticsContext.Provider value={analytics}>
       {children}
-      <HubspotLoader consent={hubspotConsent} onLoad={setHubspotScriptLoaded} />
+      <HubspotLoader
+        consent={hubspotConsent}
+        onLoad={setHubspotScriptLoadedOnce}
+      />
     </analyticsContext.Provider>
   );
 };
diff --git a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
index 464859305..1fda7ec0d 100644
--- a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
@@ -20,11 +20,10 @@ import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModerati
 import type { Moderation } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
-import type { Message } from "ai";
-import { nanoid } from "ai";
-import type { ChatRequestOptions, CreateMessage } from "ai";
+import type { ChatRequestOptions, CreateMessage, Message } from "ai";
 import { useChat } from "ai/react";
 import { useTemporaryLessonPlanWithStreamingEdits } from "hooks/useTemporaryLessonPlanWithStreamingEdits";
+import { nanoid } from "nanoid";
 import { redirect, usePathname, useRouter } from "next/navigation";
 
 import { useLessonPlanTracking } from "@/lib/analytics/lessonPlanTrackingContext";
@@ -77,7 +76,7 @@ const messageHashes = {};
 
 function clearHashCache() {
   for (const key in messageHashes) {
-    if (messageHashes.hasOwnProperty(key)) {
+    if (Object.prototype.hasOwnProperty.call(messageHashes, key)) {
       delete messageHashes[key];
     }
   }
diff --git a/apps/nextjs/src/components/ContextProviders/Demo.tsx b/apps/nextjs/src/components/ContextProviders/Demo.tsx
index 8de258089..c5cecba2d 100644
--- a/apps/nextjs/src/components/ContextProviders/Demo.tsx
+++ b/apps/nextjs/src/components/ContextProviders/Demo.tsx
@@ -14,18 +14,16 @@ const DEMO_APP_SESSIONS_PER_30D = parseInt(
   10,
 );
 
-export type DemoContextProps =
-  | {
-      isDemoUser: true;
-      appSessionsRemaining: number | undefined;
-      appSessionsPerMonth: number;
-      contactHref: string;
-      isSharingEnabled: boolean;
-    }
-  | {
-      isDemoUser: false;
-      isSharingEnabled: boolean;
-    };
+type Demo = {
+  appSessionsRemaining: number | undefined;
+  appSessionsPerMonth: number;
+  contactHref: string;
+};
+
+export type DemoContextProps = { isSharingEnabled: boolean } & (
+  | { isDemoUser: true; demo: Demo }
+  | { isDemoUser: false; demo: undefined }
+);
 
 export const DemoContext = createContext<DemoContextProps | null>(null);
 
@@ -52,14 +50,17 @@ export function DemoProvider({ children }: Readonly<DemoProviderProps>) {
       isDemoUser
         ? {
             isDemoUser,
-            appSessionsRemaining,
-            appSessionsPerMonth: DEMO_APP_SESSIONS_PER_30D,
-            contactHref:
-              "https://share.hsforms.com/1R9ulYSNPQgqElEHde3KdhAbvumd",
+            demo: {
+              appSessionsRemaining,
+              appSessionsPerMonth: DEMO_APP_SESSIONS_PER_30D,
+              contactHref:
+                "https://share.hsforms.com/1R9ulYSNPQgqElEHde3KdhAbvumd",
+            },
             isSharingEnabled,
           }
         : {
             isDemoUser,
+            demo: undefined,
             isSharingEnabled,
           },
     [isDemoUser, appSessionsRemaining, isSharingEnabled],
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ClearChatHistory.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ClearChatHistory.tsx
index 07e9ed1ca..bcdb28aa8 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ClearChatHistory.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ClearChatHistory.tsx
@@ -61,7 +61,9 @@ const ClearChatHistory = ({
       $justifyContent="center"
       $gap="space-between-m"
     >
-      <OakP>This will permanently delete all of your lesson history.</OakP>
+      <OakP $textAlign="center">
+        This will permanently delete all of your lesson history.
+      </OakP>
       <ModalFooterButtons
         closeDialog={handleCloseDialog}
         actionButtonStates={handleDeleteChat}
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ClearSingleChatFromChatHistory.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ClearSingleChatFromChatHistory.tsx
index 8e7afa92d..d9c54413c 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ClearSingleChatFromChatHistory.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ClearSingleChatFromChatHistory.tsx
@@ -68,7 +68,7 @@ const ClearSingleChatFromChatHistory = ({
       $gap="space-between-m"
       $justifyContent="center"
     >
-      <OakP>This will permanently delete this lesson.</OakP>
+      <OakP $textAlign="center">This will permanently delete this lesson.</OakP>
       {isLoading ? (
         <OakFlex $justifyContent="center" $alignItems="center">
           <LoadingWheel />
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx
index 48d1c22a9..3f7192aaf 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx
@@ -12,7 +12,7 @@ import { captureMessage } from "@sentry/nextjs";
 
 import { useDemoUser } from "@/components/ContextProviders/Demo";
 
-import { DialogContainer, DialogHeading } from "./DemoSharedComponents";
+import { DialogContainer } from "./DemoSharedComponents";
 
 const log = aiLogger("demo");
 
@@ -46,20 +46,20 @@ const CreatingChatDialog = ({
   submit,
   closeDialog,
 }: CreatingChatDialogProps) => {
-  const demo = useDemoUser();
+  const { isDemoUser, demo } = useDemoUser();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [appSessionsRemaining, setAppSessionsRemaining] = useState<
     number | undefined
-  >(demo.isDemoUser ? demo.appSessionsRemaining : undefined);
+  >(isDemoUser ? demo.appSessionsRemaining : undefined);
 
   // Don't update the remaining count while submitting as the mutation will change it
   useEffect(() => {
-    if (demo.isDemoUser && !isSubmitting) {
+    if (isDemoUser && !isSubmitting) {
       setAppSessionsRemaining(demo.appSessionsRemaining);
     }
-  }, [isSubmitting, demo]);
+  }, [isSubmitting, isDemoUser, demo]);
 
-  const createAppSession = useCallback(async () => {
+  const createAppSession = useCallback(() => {
     if (!submit) {
       throw new Error("DemoInterstitialDialog requires a submit function");
     }
@@ -67,14 +67,14 @@ const CreatingChatDialog = ({
     setIsSubmitting(true);
 
     try {
-      await submit();
+      submit();
     } catch (error) {
       log.error("Error creating demo lesson:", error);
       setIsSubmitting(false);
     }
   }, [submit]);
 
-  if (!demo.isDemoUser) {
+  if (!isDemoUser) {
     return null;
   }
 
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/DemoShareLockedDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/DemoShareLockedDialog.tsx
index d18c9170f..0ce7ad715 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/DemoShareLockedDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/DemoShareLockedDialog.tsx
@@ -1,7 +1,6 @@
 import { OakFlex, OakP, OakPrimaryButton } from "@oaknational/oak-components";
 import { Flex } from "@radix-ui/themes";
 
-import Button from "@/components/Button";
 import { useDemoUser } from "@/components/ContextProviders/Demo";
 
 function DialogContainer({ children }: { readonly children: React.ReactNode }) {
@@ -30,9 +29,9 @@ const DemoShareLockedDialog = ({
 }: {
   readonly closeDialog: () => void;
 }) => {
-  const demo = useDemoUser();
+  const { isDemoUser, demo } = useDemoUser();
 
-  if (!demo.isDemoUser) {
+  if (!isDemoUser) {
     return null;
   }
 
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx
index 71f4f4f74..7a48cb53c 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx
@@ -1,3 +1,5 @@
+import { JSX } from "react";
+
 import { OakFlex, OakSpan } from "@oaknational/oak-components";
 
 import { OakLinkNoUnderline } from "@/components/OakLinkNoUnderline";
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
index 028da875e..351ad512d 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useCallback, useState } from "react";
 
 import { aiLogger } from "@oakai/logger";
 import {
@@ -11,9 +11,6 @@ import { Flex } from "@radix-ui/themes";
 import type { Message } from "ai";
 import { usePosthogFeedbackSurvey } from "hooks/surveys/usePosthogFeedbackSurvey";
 
-import ChatButton from "@/components/AppComponents/Chat/ui/chat-button";
-import { Icon } from "@/components/Icon";
-
 import ModalFooterButtons from "./ModalFooterButtons";
 
 const log = aiLogger("chat");
@@ -39,35 +36,49 @@ const ReportContentDialog = ({
       surveyName: "Report Content",
     });
 
-  function close() {
+  const close = useCallback(() =>{
     closeDialog();
     closeDialogWithPostHogDismiss();
-  }
+  }, [closeDialog, closeDialogWithPostHogDismiss]);
 
-  async function onSubmit(e?: React.FormEvent<HTMLFormElement>) {
-    log.info("submitting");
-    e?.preventDefault();
-    setUserHasSubmitted(true);
-    submitSurveyWithOutClosing({
-      //Messages Array
-      $survey_response: messages ?? "No chat history",
-      // Last Message Id
-      $survey_response_1: messages
-        ? messages[messages.length - 1]?.id
-        : "No chat history",
-      // Chat Id
-      $survey_response_2: chatId,
-      // Comment
-      $survey_response_3: userInput,
-    });
-    setUserInput("");
-  }
+  const onSubmit = useCallback(
+    (
+      e?:
+        | React.FormEvent<HTMLFormElement>
+        | React.MouseEvent<HTMLButtonElement>,
+    ) => {
+      log.info("submitting");
+      e?.preventDefault();
+      setUserHasSubmitted(true);
+      submitSurveyWithOutClosing({
+        //Messages Array
+        $survey_response: messages ?? "No chat history",
+        // Last Message Id
+        $survey_response_1: messages
+          ? messages[messages.length - 1]?.id
+          : "No chat history",
+        // Chat Id
+        $survey_response_2: chatId,
+        // Comment
+        $survey_response_3: userInput,
+      });
+      setUserInput("");
+    },
+    [chatId, messages, submitSurveyWithOutClosing, userInput],
+  );
+
+  const actionButtonStates = useCallback(
+    () => (
+      <OakPrimaryButton onClick={onSubmit}>Submit feedback</OakPrimaryButton>
+    ),
+    [onSubmit],
+  );
 
   return (
     <Flex className="h-full w-full" direction="column" justify="between">
       <form
         className="flex flex-col gap-14"
-        onSubmit={async (e) => {
+        onSubmit={(e) => {
           e.preventDefault();
         }}
       >
@@ -97,11 +108,7 @@ const ReportContentDialog = ({
             />
 
             <ModalFooterButtons
-              actionButtonStates={() => (
-                <OakPrimaryButton onClick={() => onSubmit()}>
-                  Submit feedback
-                </OakPrimaryButton>
-              )}
+              actionButtonStates={actionButtonStates}
               closeDialog={close}
             />
           </>
diff --git a/apps/nextjs/src/components/DialogControl/DialogContents.stories.tsx b/apps/nextjs/src/components/DialogControl/DialogContents.stories.tsx
index 77e245f78..b519c01e1 100644
--- a/apps/nextjs/src/components/DialogControl/DialogContents.stories.tsx
+++ b/apps/nextjs/src/components/DialogControl/DialogContents.stories.tsx
@@ -1,41 +1,30 @@
 import type { Meta, StoryObj } from "@storybook/react";
+import { fn } from "@storybook/test";
 import { http, HttpResponse } from "msw";
+import { SurveyQuestionType, SurveyType } from "posthog-js";
+import type { PostHog } from "posthog-js";
 
-import type { AnalyticsContext } from "@/components/ContextProviders/AnalyticsProvider";
-import { analyticsContext } from "@/components/ContextProviders/AnalyticsProvider";
+import { AnalyticsDecorator } from "@/storybook/decorators/AnalyticsDecorator";
+import { DialogContentDecorator } from "@/storybook/decorators/DialogContentDecorator";
 
-import { DialogContext } from "../AppComponents/DialogContext";
 import { DemoProvider } from "../ContextProviders/Demo";
 import DialogContents from "./DialogContents";
 
-const meta: Meta<typeof DialogContents> = {
+const meta = {
   title: "Components/Dialogs/DialogContents",
   component: DialogContents,
-  decorators: (Story, { parameters }) => {
-    return (
-      <DialogContext.Provider
-        value={{
-          dialogWindow: parameters.dialogWindow,
-          setDialogWindow: () => {},
-          dialogProps: {},
-          setDialogProps: () => {},
-          openSidebar: false,
-          setOpenSidebar: () => {},
-        }}
-      >
-        <Story />
-      </DialogContext.Provider>
-    );
+  decorators: [DialogContentDecorator],
+  args: {
+    lesson: {},
+    chatId: "example-chat-id",
   },
-};
+} satisfies Meta<typeof DialogContents>;
 
 export default meta;
-type Story = StoryObj<typeof DialogContents>;
+type Story = StoryObj<typeof meta>;
 
 export const ShareChat: Story = {
   args: {
-    lesson: {},
-    chatId: "example-chat-id",
     isShared: false,
   },
   parameters: {
@@ -115,53 +104,39 @@ export const DemoInterstitialLimited: Story = {
 
 export const Feedback: Story = {
   args: {},
+  decorators: [AnalyticsDecorator],
   parameters: {
     dialogWindow: "feedback",
-  },
-  decorators: (Story) => {
-    return (
-      <analyticsContext.Provider
-        value={
-          {
-            track: () => {},
-            trackEvent: () => {},
-            identify: () => {},
-            reset: () => {},
-            page: () => {},
-            posthogAiBetaClient: {
-              capture: () => {},
-              getSurveys: (fn) => {
-                fn([
-                  {
-                    id: "01917ac7-e417-0000-0c86-99ef890e6807",
-                    name: "End of Aila generation survey launch aug24",
-                    type: "api",
-                    questions: [
-                      {
-                        type: "rating",
-                        question:
-                          "How would you rate the structure and content of this lesson plan?",
-                      },
-                      {
-                        type: "rating",
-                        question:
-                          "How would you rate the ease of creating this lesson with Aila?",
-                      },
-                      {
-                        type: "open",
-                        question:
-                          "What suggestions do you have to improve the lesson planning experience with Aila?",
-                      },
-                    ],
-                  },
-                ]);
-              },
+    analyticsContext: {
+      posthogAiBetaClient: {
+        capture: fn(),
+        getSurveys: (fn) => {
+          fn([
+            {
+              id: "01917ac7-e417-0000-0c86-99ef890e6807",
+              name: "End of Aila generation survey launch aug24",
+              type: SurveyType.API,
+              questions: [
+                {
+                  type: SurveyQuestionType.Rating,
+                  question:
+                    "How would you rate the structure and content of this lesson plan?",
+                },
+                {
+                  type: SurveyQuestionType.Rating,
+                  question:
+                    "How would you rate the ease of creating this lesson with Aila?",
+                },
+                {
+                  type: SurveyQuestionType.Open,
+                  question:
+                    "What suggestions do you have to improve the lesson planning experience with Aila?",
+                },
+              ],
             },
-          } as unknown as AnalyticsContext
-        }
-      >
-        <Story />
-      </analyticsContext.Provider>
-    );
+          ]);
+        },
+      } as unknown as PostHog,
+    },
   },
 };
diff --git a/apps/nextjs/src/components/DialogControl/DialogContents.tsx b/apps/nextjs/src/components/DialogControl/DialogContents.tsx
index dc082288e..ed297f230 100644
--- a/apps/nextjs/src/components/DialogControl/DialogContents.tsx
+++ b/apps/nextjs/src/components/DialogControl/DialogContents.tsx
@@ -1,5 +1,8 @@
+import { useState } from "react";
+
 import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import {
+  OakModal,
   OakModalCenter,
   OakModalCenterBody,
   type OakIconName,
@@ -8,6 +11,7 @@ import type { Message } from "ai";
 import styled from "styled-components";
 
 import type { DialogTypes } from "../AppComponents/Chat/Chat/types";
+import { ChatHistory } from "../AppComponents/Chat/chat-history";
 import { useDialog } from "../AppComponents/DialogContext";
 import ClearChatHistory from "./ContentOptions/ClearChatHistory";
 import ClearSingleChatFromChatHistory from "./ContentOptions/ClearSingleChatFromChatHistory";
@@ -23,11 +27,11 @@ const dialogTitlesAndIcons: Record<
 > = {
   "share-chat": {
     title: "Share lesson",
-    iconName: "share",
+    iconName: null,
   },
   feedback: {
     title: "",
-    iconName: "books",
+    iconName: null,
   },
   "report-content": {
     title: "Report content",
@@ -72,7 +76,7 @@ const DialogContents = ({
   readonly children?: React.ReactNode;
   readonly messages?: Message[];
   readonly submit?: () => void;
-  readonly isShared?: boolean | undefined;
+  readonly isShared?: boolean;
 }) => {
   const { dialogWindow, setDialogWindow, setDialogProps, openSidebar } =
     useDialog();
@@ -89,7 +93,7 @@ const DialogContents = ({
         <OakModalAtTheFront isOpen={!!dialogWindow} onClose={closeDialog}>
           <OakModalCenterBody
             title={dialogTitlesAndIcons[dialogWindow].title}
-            iconName={dialogTitlesAndIcons[dialogWindow].iconName || "warning"}
+            iconName={dialogTitlesAndIcons[dialogWindow].iconName ?? "warning"}
             hideIcon={dialogTitlesAndIcons[dialogWindow].iconName === null}
           >
             {children}
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts b/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts
index 37aed51c6..a325ff187 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportAdditionalMaterials.ts
@@ -95,7 +95,7 @@ export function useExportAdditionalMaterials({
       dialogOpen,
       closeDialog,
       status: query.status,
-      data: checkForSnapShotAndPreloadQuery.data || query.data,
+      data: checkForSnapShotAndPreloadQuery.data ?? query.data,
     }),
     [
       checkForSnapShotAndPreloadQuery.data,
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts b/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
index 7005f37b1..9a0560955 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 
 import type { LessonDeepPartial } from "@oakai/exports/browser";
 import { exportSlidesFullLessonSchema } from "@oakai/exports/browser";
-import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
@@ -29,8 +29,7 @@ export function useExportAllLessonAssets({
   const query = trpc.exports.generateAllAssetExports.useMutation();
 
   const [parseResult, setParseResult] = useState<
-    | { data?: LessonSlidesInputData; success: boolean; error?: ZodError }
-    | undefined
+    { data?: LessonInputData; success: boolean; error?: ZodError } | undefined
   >({ success: false });
   const debouncedParseResult = useDebounce(parseResult, 500);
 
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts b/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
index d8ae4ad9c..b650bf5c6 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
@@ -95,7 +95,7 @@ export function useExportLessonPlanDoc({
       dialogOpen,
       closeDialog,
       status: query.status,
-      data: checkForSnapShotAndPreloadQuery.data || query.data,
+      data: checkForSnapShotAndPreloadQuery.data ?? query.data,
     }),
     [
       checkForSnapShotAndPreloadQuery.data,
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
index e43e1d588..2ec8c1cec 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
@@ -96,7 +96,7 @@ export function useExportLessonSlides({
       dialogOpen,
       closeDialog,
       status: query.status,
-      data: checkForSnapShotAndPreloadQuery.data || query.data,
+      data: checkForSnapShotAndPreloadQuery.data ?? query.data,
     }),
     [
       active,
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
index 28d2e103b..c80a1966f 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
@@ -1,7 +1,10 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportDocQuizSchema } from "@oakai/exports/browser";
-import type { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
+import type {
+  LessonDeepPartial,
+  QuizDocInputData,
+} from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
 import type { ZodError } from "zod";
@@ -11,6 +14,18 @@ import { trpc } from "@/utils/trpc";
 import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
+function extractQuizFromLesson(
+  lesson: LessonDeepPartial,
+  quizType: "exit" | "starter",
+) {
+  switch (quizType) {
+    case "starter":
+      return lesson._experimental_starterQuizMathsV0 ?? lesson.starterQuiz;
+    case "exit":
+      return lesson._experimental_exitQuizMathsV0 ?? lesson.exitQuiz;
+  }
+}
+
 export function useExportQuizDoc({
   onStart,
   quizType,
@@ -21,7 +36,7 @@ export function useExportQuizDoc({
 }: ExportsHookProps<{ quizType: "exit" | "starter" }>) {
   const [dialogOpen, setDialogOpen] = useState(false);
   const query = trpc.exports.exportQuizDoc.useMutation();
-  const quiz = quizType === "exit" ? lesson.exitQuiz : lesson.starterQuiz;
+  const quiz = extractQuizFromLesson(lesson, quizType);
   const [parseResult, setParseResult] = useState<
     { data?: QuizDocInputData; success: boolean; error?: ZodError } | undefined
   >({ success: false });
@@ -114,7 +129,7 @@ export function useExportQuizDoc({
       dialogOpen,
       closeDialog,
       status: query.status,
-      data: checkForSnapShotAndPreloadQuery.data || query.data,
+      data: checkForSnapShotAndPreloadQuery.data ?? query.data,
     }),
     [
       checkForSnapShotAndPreloadQuery.data,
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
index 1a1ce8056..f1d0907c7 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
@@ -95,7 +95,7 @@ export function useExportWorksheetSlides({
       dialogOpen,
       closeDialog,
       status: query.status,
-      data: checkForSnapShotAndPreloadQuery.data || query.data,
+      data: checkForSnapShotAndPreloadQuery.data ?? query.data,
     }),
     [
       checkForSnapShotAndPreloadQuery.data,
diff --git a/apps/nextjs/src/components/Feedback/Smiley.tsx b/apps/nextjs/src/components/Feedback/Smiley.tsx
index 62e01ab79..59fd3afc1 100644
--- a/apps/nextjs/src/components/Feedback/Smiley.tsx
+++ b/apps/nextjs/src/components/Feedback/Smiley.tsx
@@ -27,8 +27,8 @@ const Smiley = ({ selected, number }: SmileyProps) => {
           fill={color}
         />
         <path
-          fill-rule="evenodd"
-          clip-rule="evenodd"
+          fillRule="evenodd"
+          clipRule="evenodd"
           d="M42.5 20.5C42.5 31.8218 33.0981 41 21.5 41C9.90195 41 0.5 31.8218 0.5 20.5C0.5 9.17818 9.90195 0 21.5 0C33.0981 0 42.5 9.17818 42.5 20.5ZM39.6034 20.5C39.6034 30.2602 31.4983 38.1724 21.5 38.1724C11.5017 38.1724 3.39655 30.2602 3.39655 20.5C3.39655 10.7398 11.5017 2.82759 21.5 2.82759C31.4983 2.82759 39.6034 10.7398 39.6034 20.5Z"
           fill={color}
         />
@@ -57,8 +57,8 @@ const Smiley = ({ selected, number }: SmileyProps) => {
           fill={color}
         />
         <path
-          fill-rule="evenodd"
-          clip-rule="evenodd"
+          fillRule="evenodd"
+          clipRule="evenodd"
           d="M41.5 20.5C41.5 31.8218 32.3219 41 21 41C9.67809 41 0.5 31.8218 0.5 20.5C0.5 9.17818 9.67809 0 21 0C32.3219 0 41.5 9.17818 41.5 20.5ZM38.6724 20.5C38.6724 30.2602 30.7602 38.1724 21 38.1724C11.2398 38.1724 3.32759 30.2602 3.32759 20.5C3.32759 10.7398 11.2398 2.82759 21 2.82759C30.7602 2.82759 38.6724 10.7398 38.6724 20.5Z"
           fill={color}
         />
@@ -87,8 +87,8 @@ const Smiley = ({ selected, number }: SmileyProps) => {
           fill={color}
         />
         <path
-          fill-rule="evenodd"
-          clip-rule="evenodd"
+          fillRule="evenodd"
+          clipRule="evenodd"
           d="M42.5 20.5C42.5 31.8218 33.098 41 21.5 41C9.90202 41 0.5 31.8218 0.5 20.5C0.5 9.17816 9.90202 0 21.5 0C33.098 0 42.5 9.17816 42.5 20.5ZM39.6034 20.5C39.6034 30.2602 31.4983 38.1724 21.5 38.1724C11.5017 38.1724 3.39655 30.2602 3.39655 20.5C3.39655 10.7398 11.5017 2.82759 21.5 2.82759C31.4983 2.82759 39.6034 10.7398 39.6034 20.5Z"
           fill={color}
         />
@@ -117,8 +117,8 @@ const Smiley = ({ selected, number }: SmileyProps) => {
           fill={color}
         />
         <path
-          fill-rule="evenodd"
-          clip-rule="evenodd"
+          fillRule="evenodd"
+          clipRule="evenodd"
           d="M41.5 20.5C41.5 31.8218 32.3219 41 21 41C9.67809 41 0.5 31.8218 0.5 20.5C0.5 9.17818 9.67809 0 21 0C32.3219 0 41.5 9.17818 41.5 20.5ZM38.6724 20.5C38.6724 30.2602 30.7602 38.1724 21 38.1724C11.2398 38.1724 3.32759 30.2602 3.32759 20.5C3.32759 10.7398 11.2398 2.82759 21 2.82759C30.7602 2.82759 38.6724 10.7398 38.6724 20.5Z"
           fill={color}
         />
@@ -147,8 +147,8 @@ const Smiley = ({ selected, number }: SmileyProps) => {
           fill={color}
         />
         <path
-          fill-rule="evenodd"
-          clip-rule="evenodd"
+          fillRule="evenodd"
+          clipRule="evenodd"
           d="M41.5 20.5C41.5 31.8218 32.3218 41 21 41C9.67816 41 0.5 31.8218 0.5 20.5C0.5 9.17816 9.67816 0 21 0C32.3218 0 41.5 9.17816 41.5 20.5ZM38.6724 20.5C38.6724 30.2602 30.7602 38.1724 21 38.1724C11.2398 38.1724 3.32759 30.2602 3.32759 20.5C3.32759 10.7398 11.2398 2.82759 21 2.82759C30.7602 2.82759 38.6724 10.7398 38.6724 20.5Z"
           fill={color}
         />
diff --git a/apps/nextjs/src/components/Feedback/index.tsx b/apps/nextjs/src/components/Feedback/index.tsx
index e41694b10..6639ceb50 100644
--- a/apps/nextjs/src/components/Feedback/index.tsx
+++ b/apps/nextjs/src/components/Feedback/index.tsx
@@ -1,10 +1,10 @@
-import { useEffect, useRef, useState } from "react";
+import { useRef, useState } from "react";
 
 import { OakPrimaryButton } from "@oaknational/oak-components";
 import { Flex } from "@radix-ui/themes";
 import type { Survey } from "posthog-js";
+import { SurveyQuestionType } from "posthog-js";
 
-import ChatButton from "../AppComponents/Chat/ui/chat-button";
 import { Icon } from "../Icon";
 
 export type FeedBackProps = Readonly<{
@@ -59,7 +59,7 @@ const FeedBack = ({
         {survey?.questions.map((question, i) => {
           const surveyResponseKey =
             i === 0 ? "$survey_response" : `$survey_response_${i}`;
-          if (question.type === "rating") {
+          if (question.type === SurveyQuestionType.Rating) {
             return (
               <div
                 key={question.question}
@@ -118,7 +118,7 @@ const FeedBack = ({
               </div>
             );
           }
-          if (question.type === "open") {
+          if (question.type === SurveyQuestionType.Open) {
             return (
               <div
                 key={question.question}
diff --git a/apps/nextjs/src/components/Footer.stories.tsx b/apps/nextjs/src/components/Footer.stories.tsx
index 1725794e8..688fc02b0 100644
--- a/apps/nextjs/src/components/Footer.stories.tsx
+++ b/apps/nextjs/src/components/Footer.stories.tsx
@@ -2,15 +2,15 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import Footer from "./Footer";
 
-const meta: Meta<typeof Footer> = {
+const meta = {
   title: "Components/Layout/Footer",
   component: Footer,
   tags: ["autodocs"],
-};
+} satisfies Meta<typeof Footer>;
 
 export default meta;
 
-type Story = StoryObj<typeof Footer>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {},
diff --git a/apps/nextjs/src/components/Footer.tsx b/apps/nextjs/src/components/Footer.tsx
index 194b60aee..25462a3b4 100644
--- a/apps/nextjs/src/components/Footer.tsx
+++ b/apps/nextjs/src/components/Footer.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { useAuth } from "@clerk/nextjs";
-import type { OakIconName } from "@oaknational/oak-components";
 import {
   OakBox,
   OakFlex,
@@ -230,7 +229,7 @@ const FooterButton = ({
         $textDecoration="none"
       >
         <span>{children}</span>
-        {href && href.includes("http") && (
+        {href?.includes("http") && (
           <ScaleSpan $scale={0.8}>
             <OakIcon iconName="external" />
           </ScaleSpan>
diff --git a/apps/nextjs/src/components/Header.stories.tsx b/apps/nextjs/src/components/Header.stories.tsx
index 0c4c4f43e..300f608c9 100644
--- a/apps/nextjs/src/components/Header.stories.tsx
+++ b/apps/nextjs/src/components/Header.stories.tsx
@@ -1,16 +1,29 @@
 import type { Meta, StoryObj } from "@storybook/react";
+import { fn } from "@storybook/test";
 
 import Header from "./Header";
 
-const meta: Meta<typeof Header> = {
+const meta = {
   title: "Components/Layout/Header",
   component: Header,
   tags: ["autodocs"],
-};
+  parameters: {
+    layout: "fullscreen",
+    docs: {
+      story: {
+        height: "80px",
+      },
+    },
+  },
+  args: {
+    menuOpen: false,
+    setMenuOpen: fn(),
+  },
+} satisfies Meta<typeof Header>;
 
 export default meta;
 
-type Story = StoryObj<typeof Header>;
+type Story = StoryObj<typeof meta>;
 
 export const SignedIn: Story = {
   args: {},
diff --git a/apps/nextjs/src/components/Onboarding/AcceptTermsForm.stories.tsx b/apps/nextjs/src/components/Onboarding/AcceptTermsForm.stories.tsx
new file mode 100644
index 000000000..bd2ba269b
--- /dev/null
+++ b/apps/nextjs/src/components/Onboarding/AcceptTermsForm.stories.tsx
@@ -0,0 +1,20 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { chromaticParams } from "@/storybook/chromatic";
+
+import { AcceptTermsForm } from "./AcceptTermsForm";
+
+const meta = {
+  title: "Pages/Onboarding/AcceptTermsForm",
+  component: AcceptTermsForm,
+  parameters: {
+    ...chromaticParams(["mobile", "desktop"]),
+  },
+} satisfies Meta<typeof AcceptTermsForm>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {},
+};
diff --git a/apps/nextjs/src/components/Onboarding/AcceptTermsForm.tsx b/apps/nextjs/src/components/Onboarding/AcceptTermsForm.tsx
index 54ce49d93..fd3a4cb79 100644
--- a/apps/nextjs/src/components/Onboarding/AcceptTermsForm.tsx
+++ b/apps/nextjs/src/components/Onboarding/AcceptTermsForm.tsx
@@ -19,9 +19,10 @@ import Link from "next/link";
 import Button from "@/components/Button";
 import CheckBox from "@/components/CheckBox";
 import SignUpSignInLayout from "@/components/SignUpSignInLayout";
-import TermsContent from "@/components/TermsContent";
 import { trpc } from "@/utils/trpc";
 
+import TermsContent from "./TermsContent";
+
 export const AcceptTermsForm = () => {
   const [dropDownOpen, setDropDownOpen] = useState(true);
   const { isLoaded } = useUser();
diff --git a/apps/nextjs/src/components/Onboarding/LegacyUpgradeNotice.stories.tsx b/apps/nextjs/src/components/Onboarding/LegacyUpgradeNotice.stories.tsx
new file mode 100644
index 000000000..11d53aad7
--- /dev/null
+++ b/apps/nextjs/src/components/Onboarding/LegacyUpgradeNotice.stories.tsx
@@ -0,0 +1,20 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { chromaticParams } from "@/storybook/chromatic";
+
+import { LegacyUpgradeNotice } from "./LegacyUpgradeNotice";
+
+const meta = {
+  title: "Pages/Onboarding/LegacyUpgradeNotice",
+  component: LegacyUpgradeNotice,
+  parameters: {
+    ...chromaticParams(["mobile", "desktop"]),
+  },
+} satisfies Meta<typeof LegacyUpgradeNotice>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {},
+};
diff --git a/apps/nextjs/src/components/Onboarding/TermsContent.stories.tsx b/apps/nextjs/src/components/Onboarding/TermsContent.stories.tsx
new file mode 100644
index 000000000..d3a282067
--- /dev/null
+++ b/apps/nextjs/src/components/Onboarding/TermsContent.stories.tsx
@@ -0,0 +1,15 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import TermsContent from "./TermsContent";
+
+const meta = {
+  title: "Components/Onboarding/TermsContent",
+  component: TermsContent,
+} satisfies Meta<typeof TermsContent>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {},
+};
diff --git a/apps/nextjs/src/components/TermsContent.tsx b/apps/nextjs/src/components/Onboarding/TermsContent.tsx
similarity index 100%
rename from apps/nextjs/src/components/TermsContent.tsx
rename to apps/nextjs/src/components/Onboarding/TermsContent.tsx
diff --git a/apps/nextjs/src/components/SignUpSignInLayout.stories.tsx b/apps/nextjs/src/components/SignUpSignInLayout.stories.tsx
new file mode 100644
index 000000000..567147602
--- /dev/null
+++ b/apps/nextjs/src/components/SignUpSignInLayout.stories.tsx
@@ -0,0 +1,18 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import SignUpSignInLayout from "./SignUpSignInLayout";
+
+const meta = {
+  title: "Components/Layout/SignUpSignInLayout",
+  component: SignUpSignInLayout,
+} satisfies Meta<typeof SignUpSignInLayout>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    children: null,
+    loaded: true,
+  },
+};
diff --git a/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx b/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
index 4c90a4093..50d88a165 100644
--- a/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
+++ b/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
@@ -43,7 +43,7 @@ export const SubjectAndKeyStageSelect = ({
   useEffect(() => {
     const havePickedUnavailableSubject =
       selectedSubject && !allowedSubjects.includes(selectedSubject);
-    if (havePickedUnavailableSubject || !selectedSubject) {
+    if (havePickedUnavailableSubject ?? !selectedSubject) {
       const firstAvailableSubject = allowedSubjects[0];
 
       if (selectedSubject !== firstAvailableSubject) {
diff --git a/apps/nextjs/src/data/lessonSectionTitlesAndMiniDescriptions.ts b/apps/nextjs/src/data/lessonSectionTitlesAndMiniDescriptions.ts
index ac9d00013..5f3622c26 100644
--- a/apps/nextjs/src/data/lessonSectionTitlesAndMiniDescriptions.ts
+++ b/apps/nextjs/src/data/lessonSectionTitlesAndMiniDescriptions.ts
@@ -1,4 +1,24 @@
-export const lessonSectionTitlesAndMiniDescriptions = {
+import type { LessonPlanKeys } from "@oakai/aila/src/protocol/schema";
+
+export const lessonSectionTitlesAndMiniDescriptions: Record<
+  LessonPlanKeys,
+  { description: string }
+> = {
+  title: {
+    description: "The name of the lesson.",
+  },
+  keyStage: {
+    description: "The educational stage for which the lesson is intended.",
+  },
+  subject: {
+    description: "The subject area of the lesson.",
+  },
+  topic: {
+    description: "An optional topic that this lesson is part of.",
+  },
+  basedOn: {
+    description: "An Oak lesson that this lesson is based on.",
+  },
   learningOutcome: {
     description:
       "A short summary of the knowledge, skills and understanding students are expected to acquire by the end of the lesson.",
@@ -47,8 +67,8 @@ export const lessonSectionTitlesAndMiniDescriptions = {
     description:
       "Extra resources for further study or practice, including worksheets, readings, and interactive activities.",
   },
-  slides: {
-    description:
-      "Visual aids and presentations used throughout the lesson to support teaching and learning.",
-  },
+  // slides: {
+  //   description:
+  //     "Visual aids and presentations used throughout the lesson to support teaching and learning.",
+  // },
 };
diff --git a/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts b/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts
index 4319a560e..fe9a8e3ec 100644
--- a/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts
+++ b/apps/nextjs/src/hooks/surveys/useModerationFeedbackSurvey.ts
@@ -22,7 +22,7 @@ export const useModerationFeedbackSurvey = ({
 
   useEffect(() => {
     if (moderationRecord.data) {
-      setComment(moderationRecord.data.userComment || "");
+      setComment(moderationRecord.data.userComment ?? "");
     }
   }, [moderationRecord.data]);
   const [hasSubmitted, setHasSubmitted] = useState(false);
diff --git a/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts b/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts
index 8f6a04eb3..7d7a0b94d 100644
--- a/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts
+++ b/apps/nextjs/src/hooks/surveys/usePosthogFeedbackSurvey.ts
@@ -3,6 +3,7 @@ import { useEffect, useState, useCallback } from "react";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/react";
 import type { Survey } from "posthog-js";
+import { SurveyType } from "posthog-js";
 
 import useAnalytics from "@/lib/analytics/useAnalytics";
 
@@ -27,7 +28,9 @@ export const usePosthogFeedbackSurvey = ({
 
   useEffect(() => {
     posthogAiBetaClient.getSurveys((surveys) => {
-      const filteredSurveys = surveys.filter((survey) => survey.type === "api");
+      const filteredSurveys = surveys.filter(
+        (survey) => survey.type === SurveyType.API,
+      );
 
       const matchingSurvey = filteredSurveys.find(
         (survey) => survey.name === surveyName,
diff --git a/apps/nextjs/src/hooks/useClerkDemoMetadata.ts b/apps/nextjs/src/hooks/useClerkDemoMetadata.ts
index e82729efa..2ddfe8c7a 100644
--- a/apps/nextjs/src/hooks/useClerkDemoMetadata.ts
+++ b/apps/nextjs/src/hooks/useClerkDemoMetadata.ts
@@ -33,7 +33,7 @@ type UserWithDemoStatus = User & {
 };
 
 export function isDemoStatusSet(user: LabsUser): user is UserWithDemoStatus {
-  const labsMetadata = user.publicMetadata.labs || {};
+  const labsMetadata = user.publicMetadata.labs ?? {};
   return "isDemoUser" in labsMetadata;
 }
 
diff --git a/apps/nextjs/src/hooks/useGeneration.ts b/apps/nextjs/src/hooks/useGeneration.ts
index b316a82fc..a988e06ae 100644
--- a/apps/nextjs/src/hooks/useGeneration.ts
+++ b/apps/nextjs/src/hooks/useGeneration.ts
@@ -444,7 +444,7 @@ type HookState<TSchema extends z.Schema> =
   | FailedGenerationState;
 
 type UseGenerationReturnValue<TSchema extends z.Schema> = {
-  requestGeneration: (mutationInputs: MutationInputs) => void;
+  requestGeneration: (mutationInputs: MutationInputs) => Promise<void>;
 } & HookState<TSchema>;
 
 enum UGActionType {
@@ -495,7 +495,7 @@ export function isGenerationHookLoading(status: UseGenerationStatus): boolean {
     case UseGenerationStatus.ERROR:
       return false;
     default:
-      throw Error(`Unhandled UseGenerationStatus ${status}`);
+      throw Error(`Unhandled UseGenerationStatus ${String(status)}`);
   }
 }
 
@@ -511,7 +511,7 @@ function isGenerationRecordLoading(status: GenerationStatus): boolean {
     case GenerationStatus.FLAGGED:
       return false;
     default:
-      throw Error(`Unhandled GenerationStatus ${status}`);
+      throw Error(`Unhandled GenerationStatus ${String(status)}`);
   }
 }
 
diff --git a/apps/nextjs/src/hooks/useRegenerateAnswers.ts b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
index 35fff7d90..bfe695c85 100644
--- a/apps/nextjs/src/hooks/useRegenerateAnswers.ts
+++ b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
@@ -59,7 +59,7 @@ const useRegenerateAnswers = ({
     Boolean(answer.lastGenerationId),
   );
   const requestRegenerateAnswersGeneration = useCallback(() => {
-    quizRequestGeneration({
+    void quizRequestGeneration({
       state,
       questionRow,
       requestGeneration,
diff --git a/apps/nextjs/src/hooks/useRegenerateDistractors.ts b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
index d8c7466e5..8c18263dc 100644
--- a/apps/nextjs/src/hooks/useRegenerateDistractors.ts
+++ b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
@@ -54,7 +54,7 @@ const useRegenerateDistractors = ({
     Boolean(distractor.lastGenerationId),
   );
   const requestRegenerateAllDistractorsGeneration = useCallback(() => {
-    quizRequestGeneration({
+    void quizRequestGeneration({
       state,
       questionRow,
       requestGeneration,
diff --git a/apps/nextjs/src/hooks/useSuggestedQuestions.ts b/apps/nextjs/src/hooks/useSuggestedQuestions.ts
index 4a2c8f192..b7c4a6414 100644
--- a/apps/nextjs/src/hooks/useSuggestedQuestions.ts
+++ b/apps/nextjs/src/hooks/useSuggestedQuestions.ts
@@ -31,7 +31,7 @@ const useSuggestedQuestions = ({
   state,
   dispatch,
 }: UseSuggestedQuestionsProps) => {
-  const [potentialNewQuestions, setPotentialNewQuestion] =
+  const [potentialNewQuestions, setPotentialNewQuestions] =
     useState<PotentialQuestionsType>([]);
 
   useEffect(() => {
@@ -39,7 +39,7 @@ const useSuggestedQuestions = ({
       state.status === QuizAppStatus.EditingSubjectAndKS ||
       state.status === QuizAppStatus.Initial
     ) {
-      setPotentialNewQuestion([]);
+      setPotentialNewQuestions([]);
     }
   }, [state]);
 
@@ -60,7 +60,7 @@ const useSuggestedQuestions = ({
         });
       },
       onSuccess: ({ data }) => {
-        setPotentialNewQuestion(data.response);
+        setPotentialNewQuestions(data.response);
       },
     },
   );
@@ -107,7 +107,7 @@ const useSuggestedQuestions = ({
     hasError,
     potentialNewQuestions,
     medianTimeTakenForPrompt,
-    setPotentialNewQuestion,
+    setPotentialNewQuestions,
   };
 };
 
diff --git a/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts b/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
index ec963f1a3..d0e355649 100644
--- a/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
+++ b/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
@@ -106,7 +106,7 @@ export const useTemporaryLessonPlanWithStreamingEdits = ({
   // );
 
   return useMemo(() => {
-    if (!throttledAssistantMessages || !throttledAssistantMessages.length) {
+    if (!throttledAssistantMessages?.length) {
       return {
         tempLessonPlan: tempLessonPlanRef.current,
         partialPatches: [],
diff --git a/apps/nextjs/src/lib/analytics/helpers.ts b/apps/nextjs/src/lib/analytics/helpers.ts
index 000ee732a..a10786c4e 100644
--- a/apps/nextjs/src/lib/analytics/helpers.ts
+++ b/apps/nextjs/src/lib/analytics/helpers.ts
@@ -8,6 +8,7 @@ import type {
   ProductValueType,
 } from "../avo/Avo";
 import { ModeratedContentType } from "../avo/Avo";
+import { parseKeyStage } from "./keyStages";
 
 /**
  * These are the actions which a user could take which result in a message
@@ -34,7 +35,7 @@ export function getLessonTrackingProps({
     product: "ai lesson assistant",
     lessonPlanTitle: lesson.title ?? "",
     subjectSlug: lesson.subject ?? "",
-    keyStageSlug: lesson.keyStage ?? "",
+    keyStageSlug: parseKeyStage(lesson.keyStage ?? ""),
   };
 }
 
diff --git a/apps/nextjs/src/lib/analytics/keyStages.test.ts b/apps/nextjs/src/lib/analytics/keyStages.test.ts
new file mode 100644
index 000000000..4c0eec7ff
--- /dev/null
+++ b/apps/nextjs/src/lib/analytics/keyStages.test.ts
@@ -0,0 +1,123 @@
+import { parseKeyStage } from "./keyStages";
+
+const testKeyStageMap: Record<
+  string,
+  "ks1" | "ks2" | "ks3" | "ks4" | "ks5" | "early-years-foundation-stage"
+> = {
+  "1-2": "ks1",
+  "10": "ks4",
+  "12": "ks5",
+  "6": "ks2",
+  "A Level": "ks5",
+  "A level": "ks5",
+  "A-Level": "ks5",
+  "A-level": "ks5",
+  ALevel: "ks5",
+  EYFS: "early-years-foundation-stage",
+  "EYFS SEN": "early-years-foundation-stage",
+  "Early Years": "early-years-foundation-stage",
+  "Early Years Foundation Stage": "early-years-foundation-stage",
+  "Early Years Foundation Stage (EYFS)": "early-years-foundation-stage",
+  "Foundation Stage": "early-years-foundation-stage",
+  GCSE: "ks4",
+  "GCSE Higher": "ks4",
+  "GCSE OCR": "ks4",
+  KS1: "ks1",
+  KS2: "ks2",
+  "KS2 Upper": "ks2",
+  "KS2 Year 4": "ks2",
+  "KS2 Year 5": "ks2",
+  KS3: "ks3",
+  "KS3 Geography": "ks3",
+  "KS3 Geography L1 . Mrs Karaphillides": "ks3",
+  "KS3 and KS4": "ks3",
+  "KS3,4": "ks3",
+  "KS3-4": "ks3",
+  KS4: "ks4",
+  "KS4 and KS5": "ks4",
+  KS5: "ks5",
+  "Key Stage 1": "ks1",
+  "Key Stage 1 & 2": "ks1",
+  "Key Stage 1 and Key Stage 2": "ks1",
+  "Key Stage 1/2": "ks1",
+  "Key Stage 2": "ks2",
+  "Key Stage 2 Year 4": "ks2",
+  "Key Stage 2, Year 3": "ks2",
+  "Key Stage 2/3": "ks2",
+  "Key Stage 3": "ks3",
+  "Key Stage 3 & 4": "ks3",
+  "Key Stage 3, 4": "ks3",
+  "Key Stage 3, Year 9": "ks3",
+  "Key Stage 4": "ks4",
+  "Key Stage 4 (Year 11, GCSE)": "ks4",
+  "Key Stage 5": "ks5",
+  "Key Stage 5 (AS Level)": "ks5",
+  "Key Stage 5+": "ks5",
+  Reception: "early-years-foundation-stage",
+  "Year 1": "ks1",
+  "Year 1/2": "ks1",
+  "Year 10": "ks4",
+  "Year 11": "ks4",
+  "Year 12": "ks5",
+  "Year 2": "ks1",
+  "Year 3": "ks2",
+  "Year 3 & 4": "ks2",
+  "Year 4": "ks2",
+  "Year 5": "ks2",
+  "Year 5 - Key Stage 2": "ks2",
+  "Year 6": "ks2",
+  "Year 7": "ks3",
+  "Year 8": "ks3",
+  "Year 9": "ks3",
+  "early-years": "early-years-foundation-stage",
+  "early-years-foundation-stage": "early-years-foundation-stage",
+  "early-years-foundation-stage, key-stage-1, key-stage-2":
+    "early-years-foundation-stage",
+  eyfs: "early-years-foundation-stage",
+  "key stage 3": "ks3",
+  "key stage 4": "ks4",
+  "key-stage-1": "ks1",
+  "key-stage-1 and key-stage-2": "ks1",
+  "key-stage-1, key-stage-2": "ks1",
+  "key-stage-2": "ks2",
+  "key-stage-2 Year 4": "ks2",
+  "key-stage-2 year 6": "ks2",
+  "key-stage-2, key-stage-3": "ks2",
+  "key-stage-3": "ks3",
+  "key-stage-3, key-stage-4": "ks3",
+  "key-stage-3|key-stage-4": "ks3",
+  "key-stage-4": "ks4",
+  "key-stage-5": "ks5",
+  "sixth form": "ks5",
+  "year 1": "ks1",
+  "year 4": "ks2",
+  "year-3": "ks2",
+  "year-4": "ks2",
+  "year-5": "ks2",
+  "year-7": "ks3",
+  "year-8": "ks3",
+  "year-9": "ks3",
+};
+
+describe("Analytics helpers", () => {
+  describe("parseKeyStage", () => {
+    test("Converts 'Key stage {n}' to 'ks{n}'", () => {
+      expect(parseKeyStage("Key stage 3")).toBe("ks3");
+    });
+    test("Converts 'key-stage-{n}' to 'ks{n}'", () => {
+      expect(parseKeyStage("key-stage-2")).toBe("ks2");
+    });
+    test("Converts 'KS{n}' to 'ks{n}'", () => {
+      expect(parseKeyStage("KS1")).toBe("ks1");
+    });
+    test("Converts '{n} to 'ks{n}'", () => {
+      expect(parseKeyStage("1")).toBe("ks1");
+    });
+    test.each(Object.entries(testKeyStageMap))(
+      "Converts '%s' to '%s'",
+      (input, expected) => {
+        expect(parseKeyStage(input)).toBe(expected);
+      },
+    );
+  });
+});
diff --git a/apps/nextjs/src/lib/analytics/keyStages.ts b/apps/nextjs/src/lib/analytics/keyStages.ts
new file mode 100644
index 000000000..ebf68d368
--- /dev/null
+++ b/apps/nextjs/src/lib/analytics/keyStages.ts
@@ -0,0 +1,89 @@
+type KeyStage =
+  | "ks1"
+  | "ks2"
+  | "ks3"
+  | "ks4"
+  | "ks5"
+  | "early-years-foundation-stage";
+/**
+ * If a string starts with any of the keys in this map, it will be mapped to the
+ * corresponding value.
+ */
+const startKeyStageMap: Record<string, KeyStage> = {
+  ks1: "ks1",
+  ks2: "ks2",
+  ks3: "ks3",
+  ks4: "ks4",
+  ks5: "ks5",
+  key_stage_1: "ks1",
+  key_stage_2: "ks2",
+  key_stage_3: "ks3",
+  key_stage_4: "ks4",
+  key_stage_5: "ks5",
+  eyfs: "early-years-foundation-stage",
+  early_years: "early-years-foundation-stage",
+  foundation_stage: "early-years-foundation-stage",
+  reception: "early-years-foundation-stage",
+  sixth_form: "ks5",
+  gcse: "ks4",
+  a_level: "ks5",
+  alevel: "ks5",
+  year_2: "ks1",
+  year_3: "ks2",
+  year_4: "ks2",
+  year_5: "ks2",
+  year_6: "ks2",
+  year_7: "ks3",
+  year_8: "ks3",
+  year_9: "ks3",
+  year_10: "ks4",
+  year_11: "ks4",
+  year_12: "ks5",
+  year_13: "ks5",
+};
+
+/**
+ * If a string is an exact key in this map, it will be mapped to the corresponding value.
+ */
+const exactKeyStageMap: Record<string, KeyStage> = {
+  year_1: "ks1",
+  year_1_2: "ks1",
+  "1_2": "ks1",
+  // 1-5 assume keystage
+  1: "ks1",
+  2: "ks2",
+  3: "ks3",
+  4: "ks4",
+  5: "ks5",
+  // 6-13 assume year
+  6: "ks2",
+  7: "ks3",
+  8: "ks3",
+  9: "ks3",
+  10: "ks4",
+  11: "ks4",
+  12: "ks5",
+  13: "ks5",
+};
+
+export function parseKeyStage(maybeKeyStage: string): string {
+  const strippedMaybeKeyStage = maybeKeyStage
+    .toLowerCase()
+    .replace(/[^a-z0-9]/g, "_");
+
+  // Check for exact matches first
+  const exactMatch = exactKeyStageMap[strippedMaybeKeyStage];
+  if (exactMatch) {
+    return exactMatch;
+  }
+
+  // Check for a partial match
+  const startMatch = Object.entries(startKeyStageMap).find(([key]) =>
+    strippedMaybeKeyStage.startsWith(key),
+  );
+  if (startMatch) {
+    return startMatch[1]; // Return the mapped value
+  }
+
+  return maybeKeyStage;
+}
diff --git a/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx b/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
index 2f9e9a3af..e18c92d52 100644
--- a/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
+++ b/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
@@ -21,7 +21,7 @@ type OnStreamFinishedProps = {
   nextLesson: LooseLessonPlan;
   messages: Message[];
 };
-type LessonPlanTrackingContext = {
+type LessonPlanTrackingContextProps = {
   onStreamFinished: (props: OnStreamFinishedProps) => void;
   onSubmitText: (text: string) => void;
   onClickContinue: () => void;
@@ -30,8 +30,8 @@ type LessonPlanTrackingContext = {
   onClickStartFromFreeText: (text: string) => void;
 };
 
-const lessonPlanTrackingContext =
-  createContext<LessonPlanTrackingContext | null>(null);
+export const LessonPlanTrackingContext =
+  createContext<LessonPlanTrackingContextProps | null>(null);
 
 export type LessonPlanTrackingProviderProps = Readonly<{
   readonly children?: React.ReactNode;
@@ -91,7 +91,7 @@ const LessonPlanTrackingProvider: FC<LessonPlanTrackingProviderProps> = ({
     setUserMessageContent(text);
   }, []);
 
-  const value: LessonPlanTrackingContext = useMemo(
+  const value: LessonPlanTrackingContextProps = useMemo(
     () => ({
       onStreamFinished,
       onSubmitText,
@@ -111,14 +111,14 @@ const LessonPlanTrackingProvider: FC<LessonPlanTrackingProviderProps> = ({
   );
 
   return (
-    <lessonPlanTrackingContext.Provider value={value}>
+    <LessonPlanTrackingContext.Provider value={value}>
       {children}
-    </lessonPlanTrackingContext.Provider>
+    </LessonPlanTrackingContext.Provider>
   );
 };
 
 export const useLessonPlanTracking = () => {
-  const context = useContext(lessonPlanTrackingContext);
+  const context = useContext(LessonPlanTrackingContext);
   if (!context) {
     throw new Error(
       "useLessonPlanTracking must be used within a LessonPlanTrackingProvider",
diff --git a/apps/nextjs/src/lib/feature-flags/bootstrap.ts b/apps/nextjs/src/lib/feature-flags/bootstrap.ts
index 36ab380de..dc7a9223e 100644
--- a/apps/nextjs/src/lib/feature-flags/bootstrap.ts
+++ b/apps/nextjs/src/lib/feature-flags/bootstrap.ts
@@ -5,13 +5,12 @@ import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBe
 import { aiLogger } from "@oakai/logger";
 import cookie from "cookie";
 import type { ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapters/headers";
-import invariant from "tiny-invariant";
 
 const log = aiLogger("feature-flags");
 
 /**
  * We use posthog feature flags to toggle functionality without deploying code changes.
- * Fething feature flags on the frontend hasn't been reliable for us:
+ * Fetching feature flags on the front-end hasn't been reliable for us:
  * - you have to wait for a round trip to the posthog API
  * - we currently have a bug where denying cookie consent prevents feature flags from loading
  *
diff --git a/apps/nextjs/src/lib/hooks/use-copy-to-clipboard.tsx b/apps/nextjs/src/lib/hooks/use-copy-to-clipboard.tsx
index ff9f9af67..59f5bdedc 100644
--- a/apps/nextjs/src/lib/hooks/use-copy-to-clipboard.tsx
+++ b/apps/nextjs/src/lib/hooks/use-copy-to-clipboard.tsx
@@ -2,13 +2,13 @@
 
 import * as React from "react";
 
-interface useCopyToClipboardProps {
+interface UseCopyToClipboardProps {
   timeout?: number;
 }
 
 export function useCopyToClipboard({
   timeout = 2000,
-}: useCopyToClipboardProps) {
+}: UseCopyToClipboardProps) {
   const [isCopied, setIsCopied] = React.useState<boolean>(false);
 
   const copyToClipboard = (value: string) => {
@@ -20,7 +20,7 @@ export function useCopyToClipboard({
       return;
     }
 
-    navigator.clipboard.writeText(value).then(() => {
+    void navigator.clipboard.writeText(value).then(() => {
       setIsCopied(true);
 
       setTimeout(() => {
diff --git a/apps/nextjs/src/lib/hooks/use-sidebar.tsx b/apps/nextjs/src/lib/hooks/use-sidebar.tsx
index 176feded9..1bc53449f 100644
--- a/apps/nextjs/src/lib/hooks/use-sidebar.tsx
+++ b/apps/nextjs/src/lib/hooks/use-sidebar.tsx
@@ -1,55 +1,64 @@
 "use client";
 
-import * as React from "react";
+import {
+  createContext,
+  useContext,
+  useMemo,
+  useState,
+  useEffect,
+  useCallback,
+} from "react";
 
 const LOCAL_STORAGE_KEY = "sidebar";
 
-interface SidebarContext {
+export interface SidebarContextValue {
   isSidebarOpen: boolean;
   toggleSidebar: () => void;
   isLoading: boolean;
 }
 
-const SidebarContext = React.createContext<SidebarContext | undefined>(
+export const SidebarContext = createContext<SidebarContextValue | undefined>(
   undefined,
 );
 
 export function useSidebar() {
-  const context = React.useContext(SidebarContext);
+  const context = useContext(SidebarContext);
   if (!context) {
     throw new Error("useSidebarContext must be used within a SidebarProvider");
   }
   return context;
 }
 
-interface SidebarProviderProps {
+export interface SidebarProviderProps {
   readonly children: React.ReactNode;
 }
 
 export function SidebarProvider({ children }: SidebarProviderProps) {
-  const [isSidebarOpen, setSidebarOpen] = React.useState(false);
-  const [isLoading, setLoading] = React.useState(true);
+  const [isSidebarOpen, setIsSidebarOpen] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const value = localStorage.getItem(LOCAL_STORAGE_KEY);
     if (value) {
-      setSidebarOpen(false);
+      setIsSidebarOpen(false);
     }
-    setLoading(false);
+    setIsLoading(false);
   }, []);
 
-  const toggleSidebar = () => {
-    setSidebarOpen((value) => {
+  const toggleSidebar = useCallback(() => {
+    setIsSidebarOpen((value) => {
       const newState = !value;
       localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(newState));
       return newState;
     });
-  };
+  }, [setIsSidebarOpen]);
+
+  const contextValue: SidebarContextValue = useMemo(() => {
+    return { isSidebarOpen, toggleSidebar, isLoading };
+  }, [isSidebarOpen, isLoading, toggleSidebar]);
 
   return (
-    <SidebarContext.Provider
-      value={{ isSidebarOpen, toggleSidebar, isLoading }}
-    >
+    <SidebarContext.Provider value={contextValue}>
       {children}
     </SidebarContext.Provider>
   );
diff --git a/apps/nextjs/src/middleware.ts b/apps/nextjs/src/middleware.ts
index 7e3c23962..6322fbc05 100644
--- a/apps/nextjs/src/middleware.ts
+++ b/apps/nextjs/src/middleware.ts
@@ -1,5 +1,3 @@
-import { auth } from "@clerk/nextjs/dist/types/server";
-import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
 import type { NextMiddlewareResult } from "next/dist/server/web/types";
 import type { NextFetchEvent, NextMiddleware, NextRequest } from "next/server";
 import { NextResponse } from "next/server";
@@ -48,10 +46,10 @@ const environment = parseEnvironment(process.env.NEXT_PUBLIC_ENVIRONMENT);
 const cspConfig: CspConfig = {
   strictCsp: process.env.STRICT_CSP === "true",
   environment,
-  sentryEnv: process.env.NEXT_PUBLIC_SENTRY_ENV || "",
-  sentryRelease: process.env.NEXT_PUBLIC_APP_VERSION || "",
-  sentryReportUri: process.env.SENTRY_REPORT_URI || "",
-  cspReportSampleRate: process.env.NEXT_PUBLIC_CSP_REPORT_SAMPLE_RATE || "1",
+  sentryEnv: process.env.NEXT_PUBLIC_SENTRY_ENV ?? "",
+  sentryRelease: process.env.NEXT_PUBLIC_APP_VERSION ?? "",
+  sentryReportUri: process.env.SENTRY_REPORT_URI ?? "",
+  cspReportSampleRate: process.env.NEXT_PUBLIC_CSP_REPORT_SAMPLE_RATE ?? "1",
   vercelEnv: parseVercelEnv(process.env.VERCEL_ENV),
   enabledPolicies: {
     clerk: ["development", "preview"].includes(environment),
diff --git a/apps/nextjs/src/middlewares/auth.middleware.ts b/apps/nextjs/src/middlewares/auth.middleware.ts
index 086bbd871..04e1e69b0 100644
--- a/apps/nextjs/src/middlewares/auth.middleware.ts
+++ b/apps/nextjs/src/middlewares/auth.middleware.ts
@@ -25,6 +25,7 @@ const publicRoutes = [
   "/api/trpc/main/health.prismaCheck",
   "/api/trpc/chat/chat.health.check",
   "/api/cron-jobs/expired-exports",
+  "/api/cron-jobs/google-drive-size-quota",
   /**
    * The inngest route is protected using a signing key
    * @see https://www.inngest.com/docs/faq#my-app-s-serve-endpoint-requires-authentication-what-should-i-do
@@ -93,6 +94,7 @@ const shouldInterceptRouteForOnboarding = (req: NextRequest) => {
   return true;
 };
 
+/* eslint-disable-next-line no-undef */
 const needsToCompleteOnboarding = (sessionClaims: CustomJwtSessionClaims) => {
   const labs = sessionClaims.labs;
   return !labs.isOnboarded || labs.isDemoUser === null;
diff --git a/apps/nextjs/src/middlewares/csp.test.ts b/apps/nextjs/src/middlewares/csp.test.ts
index 7850f55d5..38a26df4d 100644
--- a/apps/nextjs/src/middlewares/csp.test.ts
+++ b/apps/nextjs/src/middlewares/csp.test.ts
@@ -31,7 +31,7 @@ function generatePoliciesForEnvironment(env: CspEnvironment): string {
   };
 
   const result = addCspHeaders(mockResponse, mockRequest, config);
-  const cspHeader = result.headers.get("Content-Security-Policy") || "";
+  const cspHeader = result.headers.get("Content-Security-Policy") ?? "";
 
   const sanitizedCspHeader = cspHeader.replace(
     /'nonce-[^']+'/g,
diff --git a/apps/nextjs/src/middlewares/csp.ts b/apps/nextjs/src/middlewares/csp.ts
index a00611977..8896df7ee 100644
--- a/apps/nextjs/src/middlewares/csp.ts
+++ b/apps/nextjs/src/middlewares/csp.ts
@@ -224,8 +224,8 @@ export const addCspHeaders = (
   if (
     request.nextUrl.pathname.match(
       /(_next\/static|_next\/image|favicon.ico)/,
-    ) ||
-    request.headers.has("next-router-prefetch") ||
+    ) ??
+    request.headers.has("next-router-prefetch") ??
     request.headers.has("purpose")
   ) {
     return response;
diff --git a/apps/nextjs/src/mocks/clerk/ClerkDecorator.tsx b/apps/nextjs/src/mocks/clerk/ClerkDecorator.tsx
index 0f38a2c45..4bb3a7b85 100644
--- a/apps/nextjs/src/mocks/clerk/ClerkDecorator.tsx
+++ b/apps/nextjs/src/mocks/clerk/ClerkDecorator.tsx
@@ -1,7 +1,13 @@
-import type { Decorator } from "@storybook/react/*";
+import type { Decorator } from "@storybook/react";
 
 import { ClerkProvider } from "./nextjsComponents";
 
+declare module "@storybook/csf" {
+  interface Parameters {
+    auth?: "loading" | "signedIn" | "signedInDemo" | "signedOut";
+  }
+}
+
 export const ClerkDecorator: Decorator = (Story, { parameters }) => {
   return (
     <ClerkProvider state={parameters.auth ?? "signedIn"}>
diff --git a/apps/nextjs/src/mocks/clerk/nextjs.ts b/apps/nextjs/src/mocks/clerk/nextjs.ts
index ea6c3ca74..e583ffc05 100644
--- a/apps/nextjs/src/mocks/clerk/nextjs.ts
+++ b/apps/nextjs/src/mocks/clerk/nextjs.ts
@@ -7,6 +7,7 @@ export {
   useAuth,
   useUser,
   useClerk,
+  useSession,
   SignedIn,
   SignedOut,
   ClerkProvider,
diff --git a/apps/nextjs/src/mocks/clerk/nextjsComponents.tsx b/apps/nextjs/src/mocks/clerk/nextjsComponents.tsx
index c96d21080..5b56737cd 100644
--- a/apps/nextjs/src/mocks/clerk/nextjsComponents.tsx
+++ b/apps/nextjs/src/mocks/clerk/nextjsComponents.tsx
@@ -87,12 +87,35 @@ export const useAuth = () => {
   };
 };
 
-export const SignedIn = ({ children }: { readonly children: React.ReactNode }) => {
+export const useSession = () => {
+  const context = React.useContext(ClerkContext);
+  const mockSession = {};
+  const session = context.isLoaded
+    ? context.isSignedIn
+      ? mockSession
+      : null
+    : undefined;
+  return {
+    isLoaded: context.isLoaded,
+    isSignedIn: context.isSignedIn,
+    session,
+  };
+};
+
+export const SignedIn = ({
+  children,
+}: {
+  readonly children: React.ReactNode;
+}) => {
   const context = React.useContext(ClerkContext);
   return context.isSignedIn ? children : null;
 };
 
-export const SignedOut = ({ children }: { readonly children: React.ReactNode }) => {
+export const SignedOut = ({
+  children,
+}: {
+  readonly children: React.ReactNode;
+}) => {
   const context = React.useContext(ClerkContext);
   return context.isSignedIn ? null : children;
 };
diff --git a/apps/nextjs/src/styles/globals.css b/apps/nextjs/src/styles/globals.css
index 17300bd72..d08754155 100644
--- a/apps/nextjs/src/styles/globals.css
+++ b/apps/nextjs/src/styles/globals.css
@@ -3,7 +3,7 @@
 @tailwind utilities;
 
 :root {
-  --base-color: #22222;
+  --base-color: #222222;
 }
 
 .radix-themes {
diff --git a/apps/nextjs/src/utils/constructOwaLessonUrl.ts b/apps/nextjs/src/utils/constructOwaLessonUrl.ts
index b2ddc7a32..58315815f 100644
--- a/apps/nextjs/src/utils/constructOwaLessonUrl.ts
+++ b/apps/nextjs/src/utils/constructOwaLessonUrl.ts
@@ -42,7 +42,6 @@ export function constructOwaLessonUrl(
   if (lessonSlug && safeParsedKeyStage && primaryOrSecondary && subjectSlug) {
     return `/teachers/programmes/${syntheticProgrammeSlug}/units/${unitSlug}/lessons/${lessonSlug}`;
   }
-  return;
 }
 
 type KeyStage = z.infer<typeof keyStageSchema>;
diff --git a/apps/nextjs/tailwind.config.cjs b/apps/nextjs/tailwind.config.cjs
index e837470b6..d9a37799b 100644
--- a/apps/nextjs/tailwind.config.cjs
+++ b/apps/nextjs/tailwind.config.cjs
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const defaultTheme = require("tailwindcss/defaultTheme");
 const { blackA } = require("@radix-ui/colors");
 
diff --git a/apps/nextjs/tests-e2e/config/common-persona.setup.ts b/apps/nextjs/tests-e2e/config/common-persona.setup.ts
index 438f1bb74..509517f82 100644
--- a/apps/nextjs/tests-e2e/config/common-persona.setup.ts
+++ b/apps/nextjs/tests-e2e/config/common-persona.setup.ts
@@ -13,7 +13,7 @@ const setTestChatIdCookie = async (page: Page, chatId: string | undefined) => {
     {
       url: TEST_BASE_URL,
       name: "typicalChatId",
-      value: chatId || "",
+      value: chatId ?? "",
     },
   ]);
 };
diff --git a/apps/nextjs/tests-e2e/helpers/auth/index.ts b/apps/nextjs/tests-e2e/helpers/auth/index.ts
index 5f070324d..58f38846e 100644
--- a/apps/nextjs/tests-e2e/helpers/auth/index.ts
+++ b/apps/nextjs/tests-e2e/helpers/auth/index.ts
@@ -52,7 +52,9 @@ export async function prepareUser(
     await test.step("Accept cookie consent", async () => {
       try {
         await page.getByTestId("cookie-banner-accept").click();
-      } catch {}
+      } catch (e) {
+        console.error("No cookie banner");
+      }
     });
 
     return login;
diff --git a/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts b/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts
index 63a1ba0f2..f3a44ebb4 100644
--- a/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts
+++ b/apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts
@@ -21,7 +21,7 @@ export async function waitForStreamingStatusChange(
   await page.waitForFunction(
     ([currentStatus, expectedStatus]) => {
       const statusElement = document.querySelector(
-        // eslint-disable-next-line @typescript-eslint/quotes, quotes
+        // eslint-disable-next-line quotes
         '[data-testid="chat-aila-streaming-status"]',
       );
       return (
@@ -67,7 +67,7 @@ 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]) {
+  if (match?.[1]) {
     return parseInt(match[1], 10);
   } else {
     return 0;
diff --git a/apps/nextjs/tests-e2e/tests/auth.test.ts b/apps/nextjs/tests-e2e/tests/auth.test.ts
index ef6bdc451..814457492 100644
--- a/apps/nextjs/tests-e2e/tests/auth.test.ts
+++ b/apps/nextjs/tests-e2e/tests/auth.test.ts
@@ -42,7 +42,9 @@ test.skip("authenticate through Clerk UI", async ({ page }) => {
 
   try {
     await page.getByTestId("cookie-banner-accept").click();
-  } catch {}
+  } catch (e) {
+    console.error("No cookie banner");
+  }
 
   await signInThroughUI(page);
 
diff --git a/apps/nextjs/tsconfig.json b/apps/nextjs/tsconfig.json
index 5b896071a..c06a83690 100644
--- a/apps/nextjs/tsconfig.json
+++ b/apps/nextjs/tsconfig.json
@@ -9,11 +9,13 @@
     "incremental": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noImplicitAny": false,
     "jsx": "preserve",
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
     /* Path Aliases */
     "baseUrl": "./src",
     "paths": {
@@ -21,7 +23,8 @@
       "@/app/*": ["app/*"],
       "@/lib/*": ["lib/*"],
       "@/utils/*": ["utils/*"],
-      "@/assets/*": ["assets/*"]
+      "@/assets/*": ["assets/*"],
+      "@/storybook/*": ["../.storybook/*"]
     },
     "plugins": [
       {
@@ -40,7 +43,8 @@
     "../../packages/aila/src/utils/types/chatApi.ts",
     "../../packages/core/src/analytics/posthogAiBetaServerClient.ts",
     "../../packages/aila/src/rateLimiting/rate-limiting.ts",
-    "jest.setup.js"
+    "jest.setup.cjs",
+    "scripts/build_config_helpers.mjs"
   ],
   "exclude": ["node_modules"],
   "extends": "../../tsconfig.json"
diff --git a/apps/nextjs/tsconfig.test.json b/apps/nextjs/tsconfig.test.json
index aff714128..9794b01d6 100644
--- a/apps/nextjs/tsconfig.test.json
+++ b/apps/nextjs/tsconfig.test.json
@@ -9,7 +9,9 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "incremental": true,
diff --git a/apps/nextjs/vercel.json b/apps/nextjs/vercel.json
index 8746c630a..891e67fdf 100644
--- a/apps/nextjs/vercel.json
+++ b/apps/nextjs/vercel.json
@@ -13,6 +13,10 @@
     {
       "path": "/api/cron-jobs/expired-exports",
       "schedule": "0 3 * * *"
+    },
+    {
+      "path": "/api/cron-jobs/google-drive-size-quota",
+      "schedule": "0 4 * * *"
     }
   ]
 }
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index 2be7313f9..000000000
--- a/docs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains documentation describing general functionality not covered by a single part of the codebase.
\ No newline at end of file
diff --git a/docs/diagrams/chat-sequence.md b/docs/diagrams/chat-sequence.md
deleted file mode 100644
index 7b9782725..000000000
--- a/docs/diagrams/chat-sequence.md
+++ /dev/null
@@ -1,78 +0,0 @@
-The following sequence diagram visualises a user completing Aila's lesson plan creation process.
-
-```mermaid
-	sequenceDiagram
-		actor User
-		participant Web App
-		participant Aila
-		participant Cache
-		participant db as Database
-		participant LLM
-        participant mod as ModerationLLM
-        participant Cohere
-
-	User->>Web App: Inputs a subject, key stage or title of a lesson they want to teach
-	activate Web App
-	Web App->>Aila: Creates a new Aila chat with skeleton lesson plan
-	activate Aila
-	Aila->>db: Saves initial lesson plan (user state)
-	Aila->>Aila: Opens chat stream
-	activate db
-    Aila->>LLM: Asks LLM to categorise initial lesson prompt
-    activate LLM
-    LLM-->>Aila: Returns categorisation for key stage and subject
-    deactivate LLM
-	Aila->>db: Asks for relevant lesson plans using categorisation
-	activate db
-	Note right of db: Uses generated vector embeddings
-	db-->>Aila: Returns relevant lesson plans
-    deactivate db
-    Aila->>Cohere: Uses Cohere to rank lesson plans by similarity
-    Cohere-->>Aila: Returns top 5 lesson plans
-    Aila->>Aila: Set top 5 relevant lesson plans for context on lesson plan
-    Aila->>Cache: Cache user lesson plan
-	Aila->>Web App: Show categorisation (key stage and subject) (RHS) and top 5 relevant lesson plans (LHS)
-	Web App->>Aila: Closes chat stream
-	deactivate Aila
-	alt User selects a relevant lesson as the lesson base
-		User->>Web App: User selects existing lesson
-        Web App->>Aila: Set basedOn in lesson plan to selected lesson
-	else No relevant lessons or user chooses not to select
-		User->>Web App: User gives another prompt or 'Continues'
-	end
-	Web App->>Aila: New chat stream
-	activate Aila
-    Aila->>Cache: Get lesson plan from cache
-    activate Cache
-    Cache-->>Aila: Returns lesson plan
-    deactivate Cache
-	Aila->>Aila: Opens chat stream
-	Aila->>LLM: Generates responses (moving through lesson plan template)
-	activate LLM
-	LLM-->>Aila: Returns lesson plan response as JSON structured output
-	deactivate LLM
-	Aila->>Aila: Uses JSON patch protocol to update lesson plan
-	Aila->>mod: Moderates messages and checks for violations
-	activate mod
-	mod-->>Aila: Returns moderation response
-	deactivate mod
-    Aila->>db: Updates lesson plan
-    activate db
-    deactivate db
-	Aila->>Web App: Displays lesson plan (RHS) and any follow up prompts (including moderation) (LHS)
-	Note right of Web App: Updates can be made to the lesson plan indefinitely
-	opt Streaming ends
-	Web App->>Aila: Closes chat stream
-	end
-	opt Lesson plan complete (all sections complete)
-	Note right of Web App: Exports and sharing are handled by the web app
-	User->>Web App: Requests export
-	Web App->>db: Requests completed lesson plan
-	activate db
-    db-->>Web App: Returns completed lesson plan
-    deactivate db
-	Web App->>Web App: Exports generated
-	end
-	deactivate Aila
-	deactivate Web App
-```
\ No newline at end of file
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 000000000..ad092b637
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,3 @@
+import config from '@oakai/eslint-config';
+
+export default config;
\ No newline at end of file
diff --git a/package.json b/package.json
index ee368c636..f023c4fde 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "oak-ai-web-app",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "FIXME:lint": "turbo lint && manypkg check",
@@ -16,6 +17,8 @@
     "db-push": "turbo db-push",
     "db-push-force": "turbo db-push-force",
     "db-seed": "turbo db-seed",
+    "deps": "NODE_OPTIONS=\"--max-old-space-size=8192\" dependency-cruiser --progress --max-depth 10 --output-type err --config .dependency-cruiser.cjs apps packages",
+    "deps:graph": "NODE_OPTIONS=\"--max-old-space-size=8192\" dependency-cruiser --progress --max-depth 10 --config .dependency-cruiser.cjs --output-type dot apps packages | dot -T svg > dependency-graph.svg",
     "dev": "FORCE_COLOR=1 turbo dev --parallel --ui=stream --log-prefix=none --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",
@@ -23,8 +26,10 @@
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "lint": "turbo lint",
     "lint:fix": "pnpm lint -- --fix",
+    "lint:debug": "pnpm lint -- --debug",
     "prompts": "turbo prompts",
     "prompts:dev": "turbo prompts:dev",
+    "sonar": "dotenv -e ./.env -- sonar-scanner",
     "sort-package-json": "sort-package-json \"package.json\" \"packages/*/package.json\" \"apps/*/package.json\"",
     "type-check": "turbo type-check",
     "node-version": "node -v",
@@ -33,37 +38,41 @@
     "test:seq": "turbo test:seq --concurrency=1 --",
     "test-e2e": "turbo test-e2e --",
     "test-e2e-ui": "turbo test-e2e-ui --",
+    "test-coverage": "COLLECT_TEST_COVERAGE=true turbo test-coverage -- --maxWorkers=33%",
     "storybook": "turbo storybook"
   },
   "prettier": "@oakai/prettier-config",
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config"
+  },
   "dependencies": {
     "@actions/core": "^1.10.1",
     "@actions/github": "^6.0.0",
     "@manypkg/cli": "^0.21.1",
     "@next/env": "14.2.18",
+    "@oakai/eslint-config": "*",
     "@oakai/prettier-config": "*",
-    "@prisma/client": "5.16.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "autoprefixer": "^10.4.16",
-    "eslint-config-custom": "0.0.0",
-    "eslint-plugin-turbo": "^2.2.3",
+    "dependency-cruiser": "^16.7.0",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
     "next": "14.2.18",
     "postcss": "^8.4.32",
-    "prettier": "^3.1.1",
+    "prettier": "^3.4.1",
     "semantic-release": "^21.1.1",
+    "sonarqube-scanner": "^4.2.6",
     "sort-package-json": "^2.6.0",
-    "tailwindcss": "^3.3.7",
     "turbo": "^2.2.3",
-    "typescript": "5.3.3"
+    "typescript": "5.7.2"
   },
   "packageManager": "pnpm@8.6.12",
   "engines": {
     "node": ">=20.9.0",
     "pnpm": ">=8"
-  }
+  },
+  "type": "module"
 }
diff --git a/packages/aila/.eslintrc.cjs b/packages/aila/.eslintrc.cjs
deleted file mode 100644
index 9526c3c79..000000000
--- a/packages/aila/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["eslint-config-custom"],
-  parserOptions: {
-    project: __dirname + "/tsconfig.json",
-  },
-};
diff --git a/packages/aila/.prettierignore b/packages/aila/.prettierignore
index b7e99510b..3098aa602 100644
--- a/packages/aila/.prettierignore
+++ b/packages/aila/.prettierignore
@@ -1 +1 @@
-jest.config.js
\ No newline at end of file
+jest.config.mjs
\ No newline at end of file
diff --git a/packages/aila/jest.config.js b/packages/aila/jest.config.js
deleted file mode 100644
index e22427243..000000000
--- a/packages/aila/jest.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const { pathsToModuleNameMapper } = require("ts-jest");
-const { compilerOptions } = require("./tsconfig.test.json");
-
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-const config = {
-  transform: {
-    "^.+\\.tsx?$": [
-      "ts-jest",
-      {
-        tsconfig: "tsconfig.test.json",
-        useESM: true,
-      },
-    ],
-  },
-  preset: "ts-jest/presets/default-esm",
-  moduleNameMapper: {
-    ...pathsToModuleNameMapper(compilerOptions.paths, { prefix: "<rootDir>/" }),
-    "^(\\.{1,2}/.*)\\.js$": "$1",
-  },
-  extensionsToTreatAsEsm: [".ts"],
-  testEnvironment: "setup-polly-jest/jest-environment-node",
-  testMatch: ["**/*.test.ts"],
-  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  rootDir: ".",
-  resetMocks: true,
-};
-
-module.exports = config;
diff --git a/packages/aila/jest.config.mjs b/packages/aila/jest.config.mjs
new file mode 100644
index 000000000..80894a6ad
--- /dev/null
+++ b/packages/aila/jest.config.mjs
@@ -0,0 +1,41 @@
+import { readFile } from "fs/promises";
+import { pathsToModuleNameMapper } from "ts-jest";
+
+const tsconfig = JSON.parse(
+  await readFile(new URL("./tsconfig.test.json", import.meta.url)),
+);
+// prettier-ignore
+const moduleNameMapper = Object.assign(
+  pathsToModuleNameMapper(tsconfig.compilerOptions.paths, { prefix: "<rootDir>/" }),
+  {
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+  }
+);
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+const config = {
+  transform: {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        tsconfig: "tsconfig.test.json",
+        useESM: true,
+        isolatedModules: true,
+      },
+    ],
+  },
+  preset: "ts-jest/presets/default-esm",
+  moduleNameMapper,
+  extensionsToTreatAsEsm: [".ts"],
+  testEnvironment: "setup-polly-jest/jest-environment-node",
+  testMatch: ["**/*.test.ts"],
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+  rootDir: ".",
+  resetMocks: true,
+  collectCoverage:
+    process.env.CI === "true" || process.env.COLLECT_TEST_COVERAGE === "true",
+  coverageReporters: ["lcov", "text"],
+  collectCoverageFrom: ["src/**/*.{ts,tsx,js,jsx}"],
+  coverageDirectory: "coverage",
+};
+
+export default config;
diff --git a/packages/aila/package.json b/packages/aila/package.json
index 70aa210ee..a64224bb0 100644
--- a/packages/aila/package.json
+++ b/packages/aila/package.json
@@ -1,20 +1,28 @@
 {
   "name": "@oakai/aila",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "license": "MIT",
   "main": "./index.ts",
   "types": "./index.ts",
   "scripts": {
     "check": "tsc --noEmit",
     "clean": "rm -rf .turbo node_modules",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "eslint .",
     "type-check": "tsc --noEmit",
-    "test": "pnpm with-env jest --colors --config jest.config.js",
-    "test:seq": "pnpm with-env jest --colors --config jest.config.js --verbose --runInBand",
-    "test-file": "pnpm with-env jest --config jest.config.js --runTestsByPath TEST_FILEPATH",
+    "test": "pnpm with-env jest --colors --config jest.config.mjs",
+    "test:seq": "pnpm with-env jest --colors --config jest.config.mjs --verbose --runInBand",
+    "test-file": "pnpm with-env jest --config jest.config.mjs --runTestsByPath TEST_FILEPATH",
+    "test-coverage": "COLLECT_TEST_COVERAGE=true pnpm with-env jest --colors --config jest.config.mjs --coverage",
     "with-env": "dotenv -e ../../.env --"
   },
   "prettier": "@oakai/prettier-config",
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "rules": {}
+  },
   "dependencies": {
     "@ai-sdk/openai": "^0.0.55",
     "@clerk/nextjs": "5.7.2",
@@ -38,21 +46,21 @@
     "zod-to-json-schema": "^3.23.0"
   },
   "devDependencies": {
+    "@oakai/eslint-config": "*",
     "@oakai/prettier-config": "*",
     "@pollyjs/adapter-fetch": "^6.0.6",
     "@pollyjs/adapter-node-http": "^6.0.6",
     "@pollyjs/core": "^6.0.6",
     "@pollyjs/persister-fs": "^6.0.6",
-    "@types/jest": "^29.5.12",
-    "eslint": "^8.56.0",
-    "eslint-plugin-turbo": "^2.2.3",
+    "@types/jest": "^29.5.14",
     "jest": "^29.7.0",
     "setup-polly-jest": "^0.11.0",
-    "ts-jest": "^29.1.4",
-    "typescript": "5.3.3"
+    "ts-jest": "^29.2.5",
+    "typescript": "5.7.2"
   },
   "engines": {
     "node": ">=20.9.0",
     "pnpm": ">=8"
-  }
+  },
+  "type": "module"
 }
diff --git a/packages/aila/src/core/Aila.test.ts b/packages/aila/src/core/Aila.test.ts
index 4f791bc7b..4ebf1a21e 100644
--- a/packages/aila/src/core/Aila.test.ts
+++ b/packages/aila/src/core/Aila.test.ts
@@ -444,9 +444,9 @@ describe("Aila", () => {
       const mockCategoriser = new MockCategoriser({ mockedLessonPlan });
 
       const mockLLMResponse = [
-        // eslint-disable-next-line @typescript-eslint/quotes, quotes
+        // eslint-disable-next-line 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
+        // eslint-disable-next-line quotes
         '{"type":"patch","reasoning":"Update subject","value":{"op":"replace","path":"/subject","value":"Updated Mocked Subject"}}␞\n',
       ];
       const mockLLMService = new MockLLMService(mockLLMResponse);
diff --git a/packages/aila/src/core/Aila.testHelpers.ts b/packages/aila/src/core/Aila.testHelpers.ts
index 927f88255..aeab41649 100644
--- a/packages/aila/src/core/Aila.testHelpers.ts
+++ b/packages/aila/src/core/Aila.testHelpers.ts
@@ -35,7 +35,7 @@ export function expectPatch(
       value: expect.objectContaining({
         op: operation,
         path: path,
-        value: value === undefined ? expect.any(String) : value,
+        value: value ?? expect.any(String),
       }),
     }),
   );
diff --git a/packages/aila/src/core/Aila.ts b/packages/aila/src/core/Aila.ts
index da30dc549..178994094 100644
--- a/packages/aila/src/core/Aila.ts
+++ b/packages/aila/src/core/Aila.ts
@@ -44,23 +44,23 @@ import type {
 const log = aiLogger("aila");
 export class Aila implements AilaServices {
   private _initialised: boolean = false; // We have a separate flag for this because we have an async initialise method which cannot be called in the constructor
-  private _analytics?: AilaAnalyticsFeature;
-  private _chat: AilaChatService;
-  private _errorReporter?: AilaErrorReportingFeature;
+  private readonly _analytics?: AilaAnalyticsFeature;
+  private readonly _chat: AilaChatService;
+  private readonly _errorReporter?: AilaErrorReportingFeature;
   private _isShutdown: boolean = false;
-  private _lesson: AilaLessonService;
-  private _chatLlmService: LLMService;
-  private _moderation?: AilaModerationFeature;
-  private _options: AilaOptionsWithDefaultFallbackValues;
-  private _snapshotStore: AilaSnapshotStore;
-  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;
+  private readonly _lesson: AilaLessonService;
+  private readonly _chatLlmService: LLMService;
+  private readonly _moderation?: AilaModerationFeature;
+  private readonly _options: AilaOptionsWithDefaultFallbackValues;
+  private readonly _snapshotStore: AilaSnapshotStore;
+  private readonly _persistence: AilaPersistenceFeature[] = [];
+  private readonly _threatDetection?: AilaThreatDetectionFeature;
+  private readonly _prisma: PrismaClientWithAccelerate;
+  private readonly _rag: AilaRagFeature;
+  private readonly _plugins: AilaPlugin[];
+  private readonly _userId!: string | undefined;
+  private readonly _chatId!: string;
+  private readonly _americanisms: AilaAmericanismsFeature;
 
   constructor(options: AilaInitializationOptions) {
     this._userId = options.chat.userId;
diff --git a/packages/aila/src/core/chat/AilaChat.ts b/packages/aila/src/core/chat/AilaChat.ts
index 1f6d75ced..763a7290a 100644
--- a/packages/aila/src/core/chat/AilaChat.ts
+++ b/packages/aila/src/core/chat/AilaChat.ts
@@ -7,8 +7,7 @@ import { aiLogger } from "@oakai/logger";
 import invariant from "tiny-invariant";
 
 import { DEFAULT_MODEL, DEFAULT_TEMPERATURE } from "../../constants";
-import type { AilaChatService } from "../../core/AilaServices";
-import type { AilaServices } from "../../core/AilaServices";
+import type { AilaChatService, AilaServices } from "../../core/AilaServices";
 import { AilaGeneration } from "../../features/generation/AilaGeneration";
 import type { AilaGenerationStatus } from "../../features/generation/types";
 import { generateMessageId } from "../../helpers/chat/generateMessageId";
@@ -17,6 +16,7 @@ import type {
   JsonPatchDocumentOptional,
 } from "../../protocol/jsonPatchProtocol";
 import {
+  extractPatches,
   LLMMessageSchema,
   parseMessageParts,
 } from "../../protocol/jsonPatchProtocol";
@@ -51,7 +51,7 @@ export class AilaChat implements AilaChatService {
   private _iteration: number | undefined;
   private _createdAt: Date | undefined;
   private _persistedChat: AilaPersistedChat | undefined;
-  private _experimentalPatches: ExperimentalPatchDocument[];
+  private readonly _experimentalPatches: ExperimentalPatchDocument[];
 
   constructor({
     id,
@@ -280,7 +280,10 @@ export class AilaChat implements AilaChatService {
   private applyExperimentalPatches() {
     const experimentalPatches = this._experimentalPatches;
 
-    log.info("Applying experimental patches", experimentalPatches);
+    log.info(
+      "Applying experimental extractAndApplyLlmPatches",
+      experimentalPatches,
+    );
 
     this._aila.lesson.applyValidPatches(experimentalPatches);
   }
@@ -295,12 +298,13 @@ export class AilaChat implements AilaChatService {
     if (status === "SUCCESS") {
       const responseText = this.accumulatedText();
       invariant(responseText, "Response text not set");
-      await this._generation.complete({ status, responseText });
+      this._generation.complete({ status, responseText });
     }
     await this._generation.persist(status);
   }
 
   private async persistChat() {
+    log.info("Persisting chat");
     await Promise.all(
       (this._aila.persistence ?? []).map((p) => p.upsertChat()),
     );
@@ -384,11 +388,12 @@ export class AilaChat implements AilaChatService {
     await this.reportUsageMetrics();
     await fetchExperimentalPatches({
       lessonPlan: this._aila.lesson.plan,
-      parsedMessages: this.parsedMessages,
+      llmPatches: extractPatches(this.accumulatedText()).validPatches,
       handlePatch: async (patch) => {
         await this.enqueue(patch);
         this.appendExperimentalPatch(patch);
       },
+      userId: this._userId,
     });
     this.applyEdits();
     const assistantMessage = this.appendAssistantMessage();
diff --git a/packages/aila/src/core/chat/AilaStreamHandler.ts b/packages/aila/src/core/chat/AilaStreamHandler.ts
index 656ee0370..bfd740457 100644
--- a/packages/aila/src/core/chat/AilaStreamHandler.ts
+++ b/packages/aila/src/core/chat/AilaStreamHandler.ts
@@ -9,9 +9,9 @@ import type { PatchEnqueuer } from "./PatchEnqueuer";
 
 const log = aiLogger("aila:stream");
 export class AilaStreamHandler {
-  private _chat: AilaChat;
+  private readonly _chat: AilaChat;
   private _controller?: ReadableStreamDefaultController;
-  private _patchEnqueuer: PatchEnqueuer;
+  private readonly _patchEnqueuer: PatchEnqueuer;
   private _streamReader?: ReadableStreamDefaultReader<string>;
 
   constructor(chat: AilaChat) {
diff --git a/packages/aila/src/core/lesson/AilaLesson.ts b/packages/aila/src/core/lesson/AilaLesson.ts
index 8f9ee63c3..da374e0d5 100644
--- a/packages/aila/src/core/lesson/AilaLesson.ts
+++ b/packages/aila/src/core/lesson/AilaLesson.ts
@@ -15,12 +15,12 @@ import type { Message } from "../chat";
 const log = aiLogger("aila:lesson");
 
 export class AilaLesson implements AilaLessonService {
-  private _aila: AilaServices;
+  private readonly _aila: AilaServices;
   private _plan: LooseLessonPlan;
   private _hasSetInitialState = false;
-  private _appliedPatches: ValidPatchDocument[] = [];
-  private _invalidPatches: ValidPatchDocument[] = [];
-  private _categoriser: AilaCategorisationFeature;
+  private readonly _appliedPatches: ValidPatchDocument[] = [];
+  private readonly _invalidPatches: ValidPatchDocument[] = [];
+  private readonly _categoriser: AilaCategorisationFeature;
 
   constructor({
     aila,
diff --git a/packages/aila/src/core/llm/MockLLMService.ts b/packages/aila/src/core/llm/MockLLMService.ts
index 034c94f60..c9b4dc744 100644
--- a/packages/aila/src/core/llm/MockLLMService.ts
+++ b/packages/aila/src/core/llm/MockLLMService.ts
@@ -7,7 +7,7 @@ async function sleep(ms: number) {
 export class MockLLMService implements LLMService {
   name = "MockLLM";
   private responseChunks: string[];
-  private responseObject: Record<string, unknown>;
+  private readonly responseObject: Record<string, unknown>;
 
   constructor(
     responseChunks: string[] = ["This is ", "a mock ", "response."],
diff --git a/packages/aila/src/core/llm/OpenAIService.ts b/packages/aila/src/core/llm/OpenAIService.ts
index 6f3d0047f..7ea16718e 100644
--- a/packages/aila/src/core/llm/OpenAIService.ts
+++ b/packages/aila/src/core/llm/OpenAIService.ts
@@ -11,9 +11,9 @@ import type { LLMService } from "./LLMService";
 const log = aiLogger("aila:llm");
 
 const STRUCTURED_OUTPUTS_ENABLED =
-  process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true" ? true : false;
+  process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true";
 export class OpenAIService implements LLMService {
-  private _openAIProvider: OpenAIProvider;
+  private readonly _openAIProvider: OpenAIProvider;
 
   public name = "OpenAIService";
 
diff --git a/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts b/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts
index e86d8fdd4..476a3451c 100644
--- a/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts
+++ b/packages/aila/src/core/prompt/builders/AilaLessonPromptBuilder.ts
@@ -156,9 +156,7 @@ export class AilaLessonPromptBuilder extends AilaPromptBuilder {
       lessonPlanJsonSchema: JSON.stringify(LessonPlanJsonSchema),
       llmResponseJsonSchema: JSON.stringify(LLMResponseJsonSchema),
       isUsingStructuredOutput:
-        process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true"
-          ? true
-          : false,
+        process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true",
     };
 
     return template(args);
diff --git a/packages/aila/src/features/analytics/AilaAnalytics.ts b/packages/aila/src/features/analytics/AilaAnalytics.ts
index 0a28776eb..b6bdd0ae6 100644
--- a/packages/aila/src/features/analytics/AilaAnalytics.ts
+++ b/packages/aila/src/features/analytics/AilaAnalytics.ts
@@ -2,9 +2,9 @@ import type { AilaServices } from "../../core/AilaServices";
 import type { AnalyticsAdapter } from "./adapters/AnalyticsAdapter";
 
 export class AilaAnalytics {
-  private _aila: AilaServices;
-  private _adapters: AnalyticsAdapter[];
-  private _operations: Promise<unknown>[] = [];
+  private readonly _aila: AilaServices;
+  private readonly _adapters: AnalyticsAdapter[];
+  private readonly _operations: Promise<unknown>[] = [];
   private _isShutdown: boolean = false;
 
   constructor({
@@ -14,7 +14,7 @@ export class AilaAnalytics {
     aila: AilaServices;
     adapters?: AnalyticsAdapter[];
   }) {
-    this._adapters = adapters || [];
+    this._adapters = adapters ?? [];
     this._aila = aila;
   }
 
diff --git a/packages/aila/src/features/analytics/adapters/DatadogAnalyticsAdapter.ts b/packages/aila/src/features/analytics/adapters/DatadogAnalyticsAdapter.ts
index 6b234e182..c21795237 100644
--- a/packages/aila/src/features/analytics/adapters/DatadogAnalyticsAdapter.ts
+++ b/packages/aila/src/features/analytics/adapters/DatadogAnalyticsAdapter.ts
@@ -6,7 +6,7 @@ import { AnalyticsAdapter } from "./AnalyticsAdapter";
 const log = aiLogger("aila:analytics");
 
 export class DatadogAnalyticsAdapter extends AnalyticsAdapter {
-  private _startedAt: number = Date.now();
+  private readonly _startedAt: number = Date.now();
 
   public initialiseAnalyticsContext() {
     // Implement any necessary initialisation logic for Datadog
diff --git a/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts b/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts
index 4b0edb998..70552f243 100644
--- a/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts
+++ b/packages/aila/src/features/analytics/adapters/PosthogAnalyticsAdapter.ts
@@ -7,8 +7,8 @@ import { reportCompletionAnalyticsEvent } from "../../../lib/openai/OpenAIComple
 import { AnalyticsAdapter } from "./AnalyticsAdapter";
 
 export class PosthogAnalyticsAdapter extends AnalyticsAdapter {
-  private _posthogClient: PostHog;
-  private _startedAt: number = Date.now();
+  private readonly _posthogClient: PostHog;
+  private readonly _startedAt: number = Date.now();
   private _isShutdown: boolean = false;
 
   constructor(aila: AilaServices) {
diff --git a/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts b/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts
index 19532c388..a1b357d66 100644
--- a/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts
+++ b/packages/aila/src/features/categorisation/categorisers/AilaCategorisation.ts
@@ -1,7 +1,7 @@
 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 type { ChatCompletionMessageParam } from "openai/resources/index.mjs";
 import { Md5 } from "ts-md5";
 
 import { DEFAULT_CATEGORISE_MODEL } from "../../../constants";
@@ -15,7 +15,7 @@ import type { AilaCategorisationFeature } from "../../types";
 const log = aiLogger("aila:categorisation");
 
 export class AilaCategorisation implements AilaCategorisationFeature {
-  private _aila: AilaServices;
+  private readonly _aila: AilaServices;
   constructor({ aila }: { aila: AilaServices }) {
     this._aila = aila;
   }
diff --git a/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts b/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts
index f5a429dde..386ebbc2a 100644
--- a/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts
+++ b/packages/aila/src/features/categorisation/categorisers/MockCategoriser.ts
@@ -2,7 +2,7 @@ import type { LooseLessonPlan } from "../../../protocol/schema";
 import type { AilaCategorisationFeature } from "../../types";
 
 export class MockCategoriser implements AilaCategorisationFeature {
-  private _mockedLessonPlan: LooseLessonPlan | undefined;
+  private readonly _mockedLessonPlan: LooseLessonPlan | undefined;
   constructor({
     mockedLessonPlan,
   }: {
@@ -11,6 +11,6 @@ export class MockCategoriser implements AilaCategorisationFeature {
     this._mockedLessonPlan = mockedLessonPlan;
   }
   public async categorise(): Promise<LooseLessonPlan | undefined> {
-    return this._mockedLessonPlan;
+    return Promise.resolve(this._mockedLessonPlan);
   }
 }
diff --git a/packages/aila/src/features/generation/AilaGeneration.ts b/packages/aila/src/features/generation/AilaGeneration.ts
index 3be904df3..ea861fea4 100644
--- a/packages/aila/src/features/generation/AilaGeneration.ts
+++ b/packages/aila/src/features/generation/AilaGeneration.ts
@@ -16,18 +16,18 @@ import type { AilaGenerationStatus } from "./types";
 const log = aiLogger("generation");
 
 export class AilaGeneration {
-  private _aila: AilaServices;
+  private readonly _aila: AilaServices;
   private _id: string;
-  private _chat: AilaChat;
+  private readonly _chat: AilaChat;
   private _status: AilaGenerationStatus = "PENDING";
-  private _startedAt?: Date;
+  private readonly _startedAt?: Date;
   private _completedAt?: Date;
   private _responseText?: string;
-  private _modelEncoding = getEncoding("cl100k_base");
+  private readonly _modelEncoding = getEncoding("cl100k_base");
   private _promptTokens: number = 0;
   private _completionTokens: number = 0;
   private _totalTokens: number = 0;
-  private _systemPrompt: string = "";
+  private readonly _systemPrompt: string = "";
   private _promptId: string | null = null;
 
   constructor({
@@ -56,7 +56,7 @@ export class AilaGeneration {
     }
   }
 
-  async complete({
+  complete({
     status,
     responseText,
   }: {
@@ -66,7 +66,7 @@ export class AilaGeneration {
     this._status = status;
     this._completedAt = new Date();
     this._responseText = responseText;
-    await this.calculateTokenUsage();
+    this.calculateTokenUsage();
   }
 
   get id() {
@@ -138,7 +138,7 @@ export class AilaGeneration {
     );
   }
 
-  private async calculateTokenUsage(): Promise<void> {
+  private calculateTokenUsage() {
     if (!this._responseText) {
       return;
     }
diff --git a/packages/aila/src/features/generation/index.test.ts b/packages/aila/src/features/generation/index.test.ts
index 1173efc77..20bb51cc6 100644
--- a/packages/aila/src/features/generation/index.test.ts
+++ b/packages/aila/src/features/generation/index.test.ts
@@ -44,7 +44,7 @@ describe("calculateTokenUsage", () => {
       systemPrompt: "Test system prompt",
       promptId: "test",
     });
-    await ailaGeneration.complete({
+    ailaGeneration.complete({
       status: "SUCCESS",
       responseText: "I am fine, thank you!",
     });
@@ -82,7 +82,7 @@ describe("calculateTokenUsage", () => {
       systemPrompt: "Test system prompt",
       promptId: "test",
     });
-    await ailaGeneration.complete({
+    ailaGeneration.complete({
       status: "SUCCESS",
       responseText: "I am fine, thank you!",
     });
diff --git a/packages/aila/src/features/moderation/AilaModeration.ts b/packages/aila/src/features/moderation/AilaModeration.ts
index 3eab050be..c50e93cdd 100644
--- a/packages/aila/src/features/moderation/AilaModeration.ts
+++ b/packages/aila/src/features/moderation/AilaModeration.ts
@@ -24,11 +24,11 @@ import { OpenAiModerator } from "./moderators/OpenAiModerator";
 const log = aiLogger("aila:moderation");
 
 export class AilaModeration implements AilaModerationFeature {
-  private _prisma: PrismaClientWithAccelerate;
-  private _moderations: Moderations;
-  private _moderator: AilaModerator;
-  private _aila: AilaServices;
-  private _shouldPersist: boolean = true;
+  private readonly _prisma: PrismaClientWithAccelerate;
+  private readonly _moderations: Moderations;
+  private readonly _moderator: AilaModerator;
+  private readonly _aila: AilaServices;
+  private readonly _shouldPersist: boolean = true;
 
   constructor({
     aila,
@@ -43,6 +43,7 @@ export class AilaModeration implements AilaModerationFeature {
     moderations?: Moderations;
     shouldPersist?: boolean;
   }) {
+    log.info("Initializing AilaModeration");
     this._aila = aila;
     this._prisma = prisma ?? globalPrisma;
 
@@ -71,6 +72,7 @@ export class AilaModeration implements AilaModerationFeature {
       appSessionId: chatId,
       messageId: lastAssistantMessage.id,
       categories: moderationResult.categories,
+      scores: moderationResult.scores,
       justification: moderationResult.justification,
       lesson: lessonPlan,
     });
@@ -87,7 +89,9 @@ export class AilaModeration implements AilaModerationFeature {
     messages: Message[];
     pluginContext: AilaPluginContext;
   }) {
+    log.info("Moderating messages", messages.length);
     if (messages.length === 0) {
+      log.info("No messages to moderate, returning default message");
       const defaultMessage: ModerationDocument = {
         type: "moderation",
         categories: [],
@@ -96,7 +100,9 @@ export class AilaModeration implements AilaModerationFeature {
     }
     const lastAssistantMessage = getLastAssistantMessage(messages);
     if (!lastAssistantMessage) {
-      throw new Error("Failed to moderate, no assistant message found");
+      const errorText = "Failed to moderate, no assistant message found";
+      log.error(errorText);
+      throw new Error(errorText);
     }
 
     const moderationResult: ModerationResult = await this.performModeration({
@@ -176,9 +182,13 @@ export class AilaModeration implements AilaModerationFeature {
     lessonPlan: LooseLessonPlan;
     retries?: number;
   }): Promise<ModerationResult> {
+    log.info("Performing moderation");
     const mockedResponse = this.mockedResponse(messages);
     if (mockedResponse) {
+      log.info("Returning mocked response", mockedResponse);
       return mockedResponse;
+    } else {
+      log.info("No mocked response found. Continuing to moderate");
     }
     const response = await this._moderator.moderate(JSON.stringify(lessonPlan));
     return (
@@ -195,10 +205,11 @@ export class AilaModeration implements AilaModerationFeature {
     messages: Message[];
     lessonPlan: LooseLessonPlan;
     retries: number;
-  }) {
+  }): Promise<ModerationResult> {
     if (retries < 1) {
       return {
         categories: [],
+        scores: undefined,
         justification: "Failed to parse moderation response",
       };
     }
diff --git a/packages/aila/src/features/moderation/moderators/MockModerator.ts b/packages/aila/src/features/moderation/moderators/MockModerator.ts
index 20c802cfc..af26b91ae 100644
--- a/packages/aila/src/features/moderation/moderators/MockModerator.ts
+++ b/packages/aila/src/features/moderation/moderators/MockModerator.ts
@@ -20,7 +20,7 @@ export class MockModerator extends AilaModerator {
     if (!result) {
       throw new AilaModerationError("No more mocked results");
     }
-    return result;
+    return Promise.resolve(result);
   }
 
   public reset(newResults?: ModerationResult[]) {
diff --git a/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts b/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts
index 5d186e632..4beb72178 100644
--- a/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts
+++ b/packages/aila/src/features/moderation/moderators/OpenAiModerator.ts
@@ -7,7 +7,7 @@ import type OpenAI from "openai";
 import type {
   ChatCompletion,
   ChatCompletionCreateParamsNonStreaming,
-} from "openai/resources";
+} from "openai/resources/index.mjs";
 import zodToJsonSchema from "zod-to-json-schema";
 
 import { AilaModerator, AilaModerationError } from ".";
@@ -41,9 +41,9 @@ export interface OpenAILike {
 
 export class OpenAiModerator extends AilaModerator {
   protected _openAIClient: OpenAILike;
-  private _temperature: number = DEFAULT_MODERATION_TEMPERATURE;
-  private _model: string = DEFAULT_MODERATION_MODEL;
-  private _aila?: AilaServices;
+  private readonly _temperature: number = DEFAULT_MODERATION_TEMPERATURE;
+  private readonly _model: string = DEFAULT_MODERATION_MODEL;
+  private readonly _aila?: AilaServices;
 
   constructor({
     chatId,
@@ -105,7 +105,7 @@ export class OpenAiModerator extends AilaModerator {
           json_schema: {
             name: "moderationResponse",
             /**
-             * Currently `strict` mode does not support minimum/maxiumum integer types, which
+             * Currently `strict` mode does not support minimum/maximum integer types, which
              * we use for the likert scale in the moderation schema.
              * @see https://community.openai.com/t/new-function-calling-with-strict-has-a-problem-with-minimum-integer-type/903258
              */
@@ -123,10 +123,7 @@ export class OpenAiModerator extends AilaModerator {
     );
 
     const log = aiLogger("aila:moderation:response");
-    log.info(
-      "Moderation response: ",
-      JSON.stringify(moderationResponse, null, 2),
-    );
+    log.info(JSON.stringify(moderationResponse));
 
     const response = moderationResponseSchema.safeParse(
       JSON.parse(moderationResponse.choices[0]?.message.content ?? "null"),
@@ -152,6 +149,7 @@ export class OpenAiModerator extends AilaModerator {
 
     return {
       justification,
+      scores,
       categories: categories.filter((category) => {
         /**
          * We only want to include the category if the parent category scores below a certain threshold.
diff --git a/packages/aila/src/features/moderation/moderators/index.ts b/packages/aila/src/features/moderation/moderators/index.ts
index c749307dd..4a176e602 100644
--- a/packages/aila/src/features/moderation/moderators/index.ts
+++ b/packages/aila/src/features/moderation/moderators/index.ts
@@ -1,8 +1,8 @@
 import type { ModerationResult } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 
 export abstract class AilaModerator {
-  private _userId: string | undefined;
-  private _chatId: string | undefined;
+  protected _userId: string | undefined;
+  protected _chatId: string | undefined;
 
   constructor({ userId, chatId }: { userId?: string; chatId?: string }) {
     this._userId = userId;
diff --git a/packages/aila/src/features/persistence/AilaPersistence.ts b/packages/aila/src/features/persistence/AilaPersistence.ts
index a375e4328..e75b3837e 100644
--- a/packages/aila/src/features/persistence/AilaPersistence.ts
+++ b/packages/aila/src/features/persistence/AilaPersistence.ts
@@ -2,8 +2,7 @@ import type { GenerationStatus } from "@prisma/client";
 import invariant from "tiny-invariant";
 
 import { AilaError } from "../../core/AilaError";
-import type { AilaChatService } from "../../core/AilaServices";
-import type { AilaServices } from "../../core/AilaServices";
+import type { AilaChatService, AilaServices } from "../../core/AilaServices";
 import type { AilaOptionsWithDefaultFallbackValues } from "../../core/types";
 import type { AilaPersistedChat } from "../../protocol/schema";
 import type { AilaGeneration } from "../generation/AilaGeneration";
diff --git a/packages/aila/src/features/persistence/adaptors/prisma/index.ts b/packages/aila/src/features/persistence/adaptors/prisma/index.ts
index de7c8cb17..198930700 100644
--- a/packages/aila/src/features/persistence/adaptors/prisma/index.ts
+++ b/packages/aila/src/features/persistence/adaptors/prisma/index.ts
@@ -18,7 +18,7 @@ import type { AilaGeneration } from "../../../generation/AilaGeneration";
 const log = aiLogger("aila:persistence");
 
 export class AilaPrismaPersistence extends AilaPersistence {
-  private _prisma: PrismaClientWithAccelerate;
+  private readonly _prisma: PrismaClientWithAccelerate;
 
   constructor({
     chat,
@@ -39,6 +39,7 @@ export class AilaPrismaPersistence extends AilaPersistence {
     const appSession = await this._prisma.appSession.findFirst({
       where: {
         id,
+        deletedAt: null,
       },
     });
 
diff --git a/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts b/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts
index 7b8d54833..25c0a7382 100644
--- a/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts
+++ b/packages/aila/src/features/snapshotStore/AilaSnapshotStore.ts
@@ -10,7 +10,7 @@ import type { LooseLessonPlan } from "../../protocol/schema";
 export class AilaSnapshotStore {
   protected _name: string;
   protected _aila: AilaServices;
-  private _prisma: PrismaClientWithAccelerate;
+  private readonly _prisma: PrismaClientWithAccelerate;
 
   constructor({
     name = "AilaSnapshotStore",
diff --git a/packages/aila/src/features/threatDetection/AilaThreatDetection.ts b/packages/aila/src/features/threatDetection/AilaThreatDetection.ts
index 04d2bc140..9ce1620ff 100644
--- a/packages/aila/src/features/threatDetection/AilaThreatDetection.ts
+++ b/packages/aila/src/features/threatDetection/AilaThreatDetection.ts
@@ -3,7 +3,7 @@ import type { AilaThreatDetector } from "./detectors/AilaThreatDetector";
 import { HeliconeThreatDetector } from "./detectors/HeliconeThreatDetector";
 
 export class AilaThreatDetection implements AilaThreatDetectionFeature {
-  private _detector: AilaThreatDetector;
+  private readonly _detector: AilaThreatDetector;
 
   get detector() {
     return this._detector;
diff --git a/packages/aila/src/features/threatDetection/detectors/MockThreatDetector.ts b/packages/aila/src/features/threatDetection/detectors/MockThreatDetector.ts
index c3548a9a3..4386cae41 100644
--- a/packages/aila/src/features/threatDetection/detectors/MockThreatDetector.ts
+++ b/packages/aila/src/features/threatDetection/detectors/MockThreatDetector.ts
@@ -1,12 +1,12 @@
 import { AilaThreatDetector } from "./AilaThreatDetector";
 
 export class MockThreatDetector extends AilaThreatDetector {
-  private _response: boolean;
+  private readonly _response: boolean;
   constructor({ response }: { response: boolean }) {
     super();
     this._response = response;
   }
   async isThreat() {
-    return this._response;
+    return Promise.resolve(this._response);
   }
 }
diff --git a/packages/aila/src/protocol/jsonPatchProtocol.ts b/packages/aila/src/protocol/jsonPatchProtocol.ts
index 74f0778ec..f3c07e02f 100644
--- a/packages/aila/src/protocol/jsonPatchProtocol.ts
+++ b/packages/aila/src/protocol/jsonPatchProtocol.ts
@@ -516,7 +516,7 @@ export type MessagePartType =
   | "id";
 
 export const MessagePartDocumentSchemaByType: {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
   [K in MessagePartType]: z.ZodSchema<any>;
 } = {
   moderation: ModerationDocumentSchema,
diff --git a/packages/aila/src/protocol/schema.ts b/packages/aila/src/protocol/schema.ts
index 21a18a6fb..3ef8d0274 100644
--- a/packages/aila/src/protocol/schema.ts
+++ b/packages/aila/src/protocol/schema.ts
@@ -547,6 +547,7 @@ export const misconceptionSchema = z.object({
   description: z.string(),
 });
 
+// #TODO Is this unused?
 export const lessonPlanForDocsSchema = z
   .object({
     title: z.string(),
@@ -567,20 +568,7 @@ export const lessonPlanForDocsSchema = z
   })
   .passthrough();
 
-export const lessonPlanSchema = z
-  .object({
-    title: z.string(),
-    keyStage: z.string(),
-    subject: z.string(),
-    starterQuiz: QuizSchema,
-    cycle1: CycleSchema,
-    cycle2: CycleSchema.optional(),
-    cycle3: CycleSchema.optional(),
-    exitQuiz: QuizSchema,
-  })
-  .passthrough();
-
-export type LessonPlanSchema = z.infer<typeof lessonPlanForDocsSchema>;
+export type LessonPlanForDocsSchema = z.infer<typeof lessonPlanForDocsSchema>;
 
 export const LessonPlanJsonSchema = zodToJsonSchema(
   CompletedLessonPlanSchema,
diff --git a/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts b/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts
index c41b38158..374ba7416 100644
--- a/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts
+++ b/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts
@@ -1,9 +1,14 @@
+import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
+import { aiLogger } from "@oakai/logger";
+
 import type {
   ExperimentalPatchDocument,
-  MessagePart,
   PatchDocument,
 } from "../../protocol/jsonPatchProtocol";
 import type { LooseLessonPlan, Quiz } from "../../protocol/schema";
+import { mathsQuizFixture } from "./mathsQuiz.fixture";
+
+const log = aiLogger("aila:experimental-patches");
 
 /**
  * Wrap a value in an experimental patch 'document'
@@ -22,24 +27,42 @@ function preparePatch(
  */
 export async function fetchExperimentalPatches({
   lessonPlan,
-  parsedMessages,
+  llmPatches,
   handlePatch,
+  userId,
 }: {
   lessonPlan: LooseLessonPlan;
-  parsedMessages: MessagePart[][];
+  llmPatches: PatchDocument[];
   handlePatch: (patch: ExperimentalPatchDocument) => Promise<void>;
+  userId?: string;
 }) {
-  if (lessonPlan.subject === "maths") {
+  if (lessonPlan.subject !== "maths") {
     // Only maths has experimental patches for now
     return;
   }
 
-  const patches = parsedMessages
-    .map((m) => m.map((p) => p.document))
-    .flat()
-    .filter((p): p is PatchDocument => p.type === "patch");
+  if (!userId) {
+    log.info("Experimental patches disabled or no user ID. Skipping.");
+    return;
+  }
+
+  const mathsQuizzesEnabled = await posthogAiBetaServerClient.isFeatureEnabled(
+    "maths-quiz-v0",
+    userId,
+  );
+
+  if (!mathsQuizzesEnabled) {
+    log.info("Maths quiz feature-flag disabled. Skipping.");
+    return;
+  }
+
+  log.info(
+    "Maths quiz feature-flag enabled for user. Fetching experimental quiz patches.",
+  );
 
-  const starterQuizPatch = patches.find((p) => p.value.path === "/starterQuiz");
+  const starterQuizPatch = llmPatches.find(
+    (p) => p.value.path === "/starterQuiz",
+  );
 
   if (starterQuizPatch) {
     const op = starterQuizPatch.value.op;
@@ -51,7 +74,7 @@ export async function fetchExperimentalPatches({
         }),
       );
     } else {
-      const mathsStarterQuiz: Quiz | null = null;
+      const mathsStarterQuiz: Quiz | null = mathsQuizFixture;
       if (mathsStarterQuiz) {
         await handlePatch(
           preparePatch({
@@ -64,7 +87,7 @@ export async function fetchExperimentalPatches({
     }
   }
 
-  const exitQuizPatch = patches.find((p) => p.value.path === "/exitQuiz");
+  const exitQuizPatch = llmPatches.find((p) => p.value.path === "/exitQuiz");
 
   if (exitQuizPatch) {
     const op = exitQuizPatch.value.op;
@@ -76,7 +99,7 @@ export async function fetchExperimentalPatches({
         }),
       );
     } else {
-      const mathsExitQuiz: Quiz | null = null;
+      const mathsExitQuiz: Quiz | null = mathsQuizFixture;
       if (mathsExitQuiz) {
         await handlePatch(
           preparePatch({
diff --git a/packages/aila/src/utils/experimentalPatches/mathsQuiz.fixture.ts b/packages/aila/src/utils/experimentalPatches/mathsQuiz.fixture.ts
new file mode 100644
index 000000000..281b27ed9
--- /dev/null
+++ b/packages/aila/src/utils/experimentalPatches/mathsQuiz.fixture.ts
@@ -0,0 +1,58 @@
+import type { Quiz } from "../../protocol/schema";
+
+export const mathsQuizFixture: Quiz = [
+  {
+    question: "How many degrees in 2 right angles?",
+    answers: ["180°"],
+    distractors: ["60°", "90°"],
+  },
+  {
+    question:
+      "Two shapes are {{}} if the only difference between them is their size.",
+    answers: ["similar"],
+    distractors: [
+      "No distractors for short answer",
+      "No distractors for short answer",
+    ],
+  },
+  {
+    question:
+      "A fruit stall is having a sale. It sells cherries in boxes of four pairs. How many cherries are there in six packs? There will be {{ }} in six packs.",
+    answers: ["24"],
+    distractors: [
+      "No distractors for short answer",
+      "No distractors for short answer",
+    ],
+  },
+  {
+    question:
+      "In which image is the circumference labelled with a question mark?",
+    answers: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/fg4uyx41rfnksbvav2nh.png)",
+    ],
+    distractors: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703163380/pz6cn5k4wmowycnjq5am.png)",
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/mr09mrwkqdtk1dvjdoi0.png)",
+    ],
+  },
+  {
+    question:
+      "Complete the statement. Triangle ABC and triangle XYZ are ____________. ![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1706110974/fukcqeavzcevgjhmm1n4.png)",
+    answers: ["similar as the three interior angles are the same."],
+    distractors: [
+      "congruent as the three interior angles are all the same.",
+      "neither similar nor congruent.",
+    ],
+  },
+  {
+    question:
+      "Here is an image ![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1706110974/fukcqeavzcevgjhmm1n4.png) and here is the same image  ![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1706110974/fukcqeavzcevgjhmm1n4.png)",
+    answers: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/fg4uyx41rfnksbvav2nh.png)",
+    ],
+    distractors: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703163380/pz6cn5k4wmowycnjq5am.png)",
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/mr09mrwkqdtk1dvjdoi0.png)",
+    ],
+  },
+];
diff --git a/packages/aila/tsconfig.json b/packages/aila/tsconfig.json
index 9f14f1afb..adf689cd4 100644
--- a/packages/aila/tsconfig.json
+++ b/packages/aila/tsconfig.json
@@ -8,6 +8,7 @@
     "../core/src/utils/subjects/index.ts"
   ],
   "compilerOptions": {
+    "baseUrl": "./src",
     "typeRoots": [
       "./../../node_modules/@types",
       "./src/types",
diff --git a/packages/aila/tsconfig.test.json b/packages/aila/tsconfig.test.json
index 82168dcf9..0e8d34959 100644
--- a/packages/aila/tsconfig.test.json
+++ b/packages/aila/tsconfig.test.json
@@ -9,7 +9,9 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "incremental": true,
diff --git a/packages/api/.eslintrc.cjs b/packages/api/.eslintrc.cjs
deleted file mode 100644
index 9526c3c79..000000000
--- a/packages/api/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["eslint-config-custom"],
-  parserOptions: {
-    project: __dirname + "/tsconfig.json",
-  },
-};
diff --git a/packages/api/package.json b/packages/api/package.json
index dff66ec9a..53b13d5a9 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,15 +1,22 @@
 {
   "name": "@oakai/api",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "license": "MIT",
   "main": "./index.ts",
   "types": "./index.ts",
   "scripts": {
     "check": "tsc --noEmit",
     "clean": "rm -rf .turbo node_modules",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "eslint .",
     "type-check": "tsc --noEmit"
   },
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "rules": {}
+  },
   "prettier": "@oakai/prettier-config",
   "dependencies": {
     "@clerk/nextjs": "5.7.2",
@@ -26,12 +33,13 @@
     "zod": "3.23.8"
   },
   "devDependencies": {
+    "@oakai/eslint-config": "*",
     "@oakai/prettier-config": "*",
-    "eslint": "^8.56.0",
-    "typescript": "5.3.3"
+    "typescript": "5.7.2"
   },
   "engines": {
     "node": ">=20.9.0",
     "pnpm": ">=8"
-  }
+  },
+  "type": "module"
 }
diff --git a/packages/api/src/export/exportAdditionalMaterialsDoc.ts b/packages/api/src/export/exportAdditionalMaterialsDoc.ts
index 826339ea4..4b532aebd 100644
--- a/packages/api/src/export/exportAdditionalMaterialsDoc.ts
+++ b/packages/api/src/export/exportAdditionalMaterialsDoc.ts
@@ -1,19 +1,13 @@
 import type { SignedInAuthObject } from "@clerk/backend/internal";
-import { clerkClient } from "@clerk/nextjs/server";
-import { LessonSnapshots } from "@oakai/core";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportAdditionalMaterials } from "@oakai/exports";
-import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonInputData } 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,
-  reportErrorResult,
-} from "../router/exports";
+import type { OutputSchema } from "../router/exports";
+import { ailaSaveExport, reportErrorResult } from "../router/exports";
+import { getExistingExportData, getUserEmail } from "./exportHelpers";
 
 const log = aiLogger("exports");
 
@@ -22,7 +16,7 @@ export async function exportAdditionalMaterialsDoc({
   ctx,
 }: {
   input: {
-    data: LessonSlidesInputData;
+    data: LessonInputData;
     chatId: string;
     messageId: string;
   };
@@ -31,50 +25,23 @@ export async function exportAdditionalMaterialsDoc({
     prisma: PrismaClientWithAccelerate;
   };
 }) {
-  const user = await clerkClient.users.getUser(ctx.auth.userId);
-  const userEmail = user?.emailAddresses[0]?.emailAddress;
-  const exportType = "ADDITIONAL_MATERIALS_DOCS";
-
+  const userEmail = await getUserEmail(ctx);
   if (!userEmail) {
     return {
       error: new Error("User email not found"),
       message: "User email not found",
     };
   }
+  const exportType = "ADDITIONAL_MATERIALS_DOCS";
 
-  const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-  const lessonSnapshot = await lessonSnapshots.getOrSaveSnapshot({
-    userId: ctx.auth.userId,
-    chatId: input.chatId,
-    messageId: input.messageId,
-    snapshot: input.data,
-    trigger: "EXPORT_BY_USER",
-  });
-
-  Sentry.addBreadcrumb({
-    category: "exportAdditionalMaterialsDoc",
-    message: "Got or saved snapshot",
-    data: { lessonSnapshot },
-  });
-
-  const exportData = await ailaGetExportBySnapshotId({
-    prisma: ctx.prisma,
-    snapshotId: lessonSnapshot.id,
+  const { exportData, lessonSnapshot } = await getExistingExportData({
+    ctx,
+    input,
     exportType,
   });
 
-  Sentry.addBreadcrumb({
-    category: "exportAdditionalMaterialsDoc",
-    message: "Got export data",
-    data: { exportData },
-  });
-
   if (exportData) {
-    const output: OutputSchema = {
-      link: exportData.gdriveFileUrl,
-      canViewSourceDoc: exportData.userCanViewGdriveFile,
-    };
-    return output;
+    return exportData;
   }
 
   const result = await exportAdditionalMaterials({
diff --git a/packages/api/src/export/exportHelpers.ts b/packages/api/src/export/exportHelpers.ts
new file mode 100644
index 000000000..e110de9ab
--- /dev/null
+++ b/packages/api/src/export/exportHelpers.ts
@@ -0,0 +1,132 @@
+import type { SignedInAuthObject } from "@clerk/backend/internal";
+import { clerkClient } from "@clerk/nextjs/server";
+import { LessonSnapshots } from "@oakai/core";
+import type { Snapshot } from "@oakai/core/src/models/lessonSnapshots";
+import type {
+  LessonExportType,
+  LessonSnapshot,
+  PrismaClientWithAccelerate,
+} from "@oakai/db";
+import * as Sentry from "@sentry/nextjs";
+
+import {
+  ailaGetExportBySnapshotId,
+  type OutputSchema,
+} from "../router/exports";
+
+export const getUserEmail = async (ctx: {
+  auth: SignedInAuthObject;
+  prisma: PrismaClientWithAccelerate;
+}) => {
+  const user = await clerkClient.users.getUser(ctx.auth.userId);
+  const userEmail = user?.emailAddresses[0]?.emailAddress;
+
+  return userEmail;
+};
+
+const categoryMap: Record<string, string> = {
+  LESSON_SLIDES_SLIDES: "exportLessonSlidesDoc",
+  LESSON_PLAN_DOC: "exportLessonPlanDoc",
+  WORKSHEET_SLIDES: "exportWorksheetDocs",
+  ADDITIONAL_MATERIALS_DOCS: "exportAdditionalMaterialsDoc",
+  EXIT_QUIZ_DOC: "exportQuizDoc",
+  STARTER_QUIZ_DOC: "exportQuizDoc",
+};
+
+export const getLessonSnapshot = async <T>({
+  input,
+  ctx,
+  exportType,
+}: {
+  input: {
+    data: T;
+    chatId: string;
+    messageId: string;
+  };
+  ctx: {
+    auth: SignedInAuthObject;
+    prisma: PrismaClientWithAccelerate;
+  };
+  exportType: LessonExportType;
+}): Promise<LessonSnapshot> => {
+  const lessonSnapshots = new LessonSnapshots(ctx.prisma);
+
+  const lessonSnapshot = await lessonSnapshots.getOrSaveSnapshot({
+    userId: ctx.auth.userId,
+    chatId: input.chatId,
+    messageId: input.messageId,
+    snapshot: input.data as Snapshot,
+    trigger: "EXPORT_BY_USER",
+  });
+
+  const category = categoryMap[exportType] ?? "exportLessonDoc";
+
+  Sentry.addBreadcrumb({
+    category,
+    message: "Got or saved snapshot",
+    data: { lessonSnapshot },
+  });
+
+  return lessonSnapshot;
+};
+
+export const getExportData = async ({
+  prisma,
+  snapshotId,
+  exportType,
+}: {
+  prisma: PrismaClientWithAccelerate;
+  snapshotId: string;
+  exportType: LessonExportType;
+}) => {
+  const exportData = await ailaGetExportBySnapshotId({
+    prisma,
+    snapshotId,
+    exportType,
+  });
+  const category = categoryMap[exportType] ?? "exportLessonDoc";
+  Sentry.addBreadcrumb({
+    category,
+    message: "Got export data",
+    data: { exportData },
+  });
+
+  if (exportData) {
+    const output: OutputSchema = {
+      link: exportData.gdriveFileUrl,
+      canViewSourceDoc: exportData.userCanViewGdriveFile,
+    };
+    return output;
+  }
+};
+
+export const getExistingExportData = async <T>({
+  input,
+  ctx,
+  exportType,
+}: {
+  input: {
+    data: T;
+    chatId: string;
+    messageId: string;
+  };
+  ctx: {
+    auth: SignedInAuthObject;
+    prisma: PrismaClientWithAccelerate;
+  };
+  exportType: LessonExportType;
+}) => {
+  const lessonSnapshot = await getLessonSnapshot<T>({
+    ctx,
+    input,
+    exportType,
+  });
+
+  const exportData = await getExportData({
+    prisma: ctx.prisma,
+    snapshotId: lessonSnapshot.id,
+    exportType,
+  });
+
+  return { exportData, lessonSnapshot };
+};
diff --git a/packages/api/src/export/exportLessonPlan.ts b/packages/api/src/export/exportLessonPlan.ts
index 705b197ae..941fb9470 100644
--- a/packages/api/src/export/exportLessonPlan.ts
+++ b/packages/api/src/export/exportLessonPlan.ts
@@ -1,19 +1,13 @@
 import type { SignedInAuthObject } from "@clerk/backend/internal";
-import { clerkClient } from "@clerk/nextjs/server";
-import { LessonSnapshots } from "@oakai/core";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportDocLessonPlan } from "@oakai/exports";
-import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonInputData } 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,
-  reportErrorResult,
-} from "../router/exports";
+import type { OutputSchema } from "../router/exports";
+import { ailaSaveExport, reportErrorResult } from "../router/exports";
+import { getExistingExportData, getUserEmail } from "./exportHelpers";
 
 const log = aiLogger("exports");
 
@@ -22,7 +16,7 @@ export async function exportLessonPlan({
   ctx,
 }: {
   input: {
-    data: LessonSlidesInputData;
+    data: LessonInputData;
     chatId: string;
     messageId: string;
   };
@@ -31,10 +25,7 @@ export async function exportLessonPlan({
     prisma: PrismaClientWithAccelerate;
   };
 }) {
-  const user = await clerkClient.users.getUser(ctx.auth.userId);
-  const userEmail = user?.emailAddresses[0]?.emailAddress;
-  const exportType = "LESSON_PLAN_DOC";
-
+  const userEmail = await getUserEmail(ctx);
   if (!userEmail) {
     return {
       error: new Error("User email not found"),
@@ -42,39 +33,16 @@ export async function exportLessonPlan({
     };
   }
 
-  const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-  const lessonSnapshot = await lessonSnapshots.getOrSaveSnapshot({
-    userId: ctx.auth.userId,
-    chatId: input.chatId,
-    messageId: input.messageId,
-    snapshot: input.data,
-    trigger: "EXPORT_BY_USER",
-  });
-
-  Sentry.addBreadcrumb({
-    category: "exportLessonPlanDoc",
-    message: "Got or saved snapshot",
-    data: { lessonSnapshot },
-  });
+  const exportType = "LESSON_PLAN_DOC";
 
-  const exportData = await ailaGetExportBySnapshotId({
-    prisma: ctx.prisma,
-    snapshotId: lessonSnapshot.id,
+  const { exportData, lessonSnapshot } = await getExistingExportData({
+    ctx,
+    input,
     exportType,
   });
 
-  Sentry.addBreadcrumb({
-    category: "exportLessonPlanDoc",
-    message: "Got export data",
-    data: { exportData },
-  });
-
   if (exportData) {
-    const output: OutputSchema = {
-      link: exportData.gdriveFileUrl,
-      canViewSourceDoc: exportData.userCanViewGdriveFile,
-    };
-    return output;
+    return exportData;
   }
 
   /**
diff --git a/packages/api/src/export/exportLessonSlides.ts b/packages/api/src/export/exportLessonSlides.ts
index c941915e3..0da0d6f99 100644
--- a/packages/api/src/export/exportLessonSlides.ts
+++ b/packages/api/src/export/exportLessonSlides.ts
@@ -1,19 +1,13 @@
 import type { SignedInAuthObject } from "@clerk/backend/internal";
-import { clerkClient } from "@clerk/nextjs/server";
-import { LessonSnapshots } from "@oakai/core";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportSlidesFullLesson } from "@oakai/exports";
 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,
-  reportErrorResult,
-} from "../router/exports";
+import type { OutputSchema } from "../router/exports";
+import { ailaSaveExport, reportErrorResult } from "../router/exports";
+import { getExistingExportData, getUserEmail } from "./exportHelpers";
 
 const log = aiLogger("exports");
 
@@ -31,50 +25,23 @@ export async function exportLessonSlides({
     prisma: PrismaClientWithAccelerate;
   };
 }) {
-  const user = await clerkClient.users.getUser(ctx.auth.userId);
-  const userEmail = user?.emailAddresses[0]?.emailAddress;
-  const exportType = "LESSON_SLIDES_SLIDES";
-
+  const userEmail = await getUserEmail(ctx);
   if (!userEmail) {
     return {
       error: new Error("User email not found"),
       message: "User email not found",
     };
   }
+  const exportType = "LESSON_SLIDES_SLIDES";
 
-  const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-  const lessonSnapshot = await lessonSnapshots.getOrSaveSnapshot({
-    userId: ctx.auth.userId,
-    chatId: input.chatId,
-    messageId: input.messageId,
-    snapshot: input.data,
-    trigger: "EXPORT_BY_USER",
-  });
-
-  Sentry.addBreadcrumb({
-    category: "exportLessonSlides",
-    message: "Got or saved snapshot",
-    data: { lessonSnapshot },
-  });
-
-  const exportData = await ailaGetExportBySnapshotId({
-    prisma: ctx.prisma,
-    snapshotId: lessonSnapshot.id,
+  const { exportData, lessonSnapshot } = await getExistingExportData({
+    ctx,
+    input,
     exportType,
   });
 
-  Sentry.addBreadcrumb({
-    category: "exportLessonSlides",
-    message: "Got export data",
-    data: { exportData },
-  });
-
   if (exportData) {
-    const output: OutputSchema = {
-      link: exportData.gdriveFileUrl,
-      canViewSourceDoc: exportData.userCanViewGdriveFile,
-    };
-    return output;
+    return exportData;
   }
 
   /**
diff --git a/packages/api/src/export/exportQuizDesignerSlides.ts b/packages/api/src/export/exportQuizDesignerSlides.ts
new file mode 100644
index 000000000..48a04a968
--- /dev/null
+++ b/packages/api/src/export/exportQuizDesignerSlides.ts
@@ -0,0 +1,96 @@
+import type { SignedInAuthObject } from "@clerk/backend/internal";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
+import { exportQuizDesignerSlides } from "@oakai/exports";
+import type { ExportableQuizAppState } 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 { qdSaveExport, reportErrorResult } from "../router/exports";
+import { getExistingExportData, getUserEmail } from "./exportHelpers";
+
+const log = aiLogger("exports");
+
+export async function exportQuizDesignerSlidesWrapper({
+  input,
+  ctx,
+}: {
+  input: {
+    data: ExportableQuizAppState;
+    chatId: string;
+    messageId: string;
+  };
+  ctx: {
+    auth: SignedInAuthObject;
+    prisma: PrismaClientWithAccelerate;
+  };
+}) {
+  const userEmail = await getUserEmail(ctx);
+  if (!userEmail) {
+    return {
+      error: new Error("User email not found"),
+      message: "User email not found",
+    };
+  }
+  const exportType = "LESSON_SLIDES_SLIDES";
+
+  const { exportData, lessonSnapshot } = await getExistingExportData({
+    ctx,
+    input,
+    exportType,
+  });
+
+  if (exportData) {
+    return exportData;
+  }
+
+  /**
+   * User hasn't yet exported the lesson in this state, so we'll do it now
+   * and store the result in the database
+   */
+
+  const result = await exportQuizDesignerSlides({
+    snapshotId: "lessonSnapshot.id",
+    userEmail,
+    onStateChange: (state) => {
+      log.info(state);
+
+      Sentry.addBreadcrumb({
+        category: "exportWorksheetSlides",
+        message: "Export state change",
+        data: state,
+      });
+    },
+    quiz: input.data,
+  });
+
+  Sentry.addBreadcrumb({
+    category: "exportLessonSlides",
+    message: "Got export result",
+    data: { result },
+  });
+
+  if ("error" in result) {
+    reportErrorResult(result, input);
+    return {
+      error: result.error,
+      message: "Failed to export lesson",
+    };
+  }
+
+  const { data } = result;
+
+  await qdSaveExport({
+    auth: ctx.auth,
+    prisma: ctx.prisma,
+    snapshotId: lessonSnapshot.id,
+    exportType,
+    data: result.data,
+  });
+
+  const output: OutputSchema = {
+    link: data.fileUrl,
+    canViewSourceDoc: data.userCanViewGdriveFile,
+  };
+  return output;
+}
diff --git a/packages/api/src/export/exportQuizDoc.ts b/packages/api/src/export/exportQuizDoc.ts
index 640273a14..178194fa0 100644
--- a/packages/api/src/export/exportQuizDoc.ts
+++ b/packages/api/src/export/exportQuizDoc.ts
@@ -1,6 +1,4 @@
 import type { SignedInAuthObject } from "@clerk/backend/internal";
-import { clerkClient } from "@clerk/nextjs/server";
-import { LessonSnapshots } from "@oakai/core";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportDocQuiz } from "@oakai/exports";
 import type { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
@@ -8,13 +6,9 @@ import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { z } from "zod";
 
-import type {
-  OutputSchema} from "../router/exports";
-import {
-  ailaGetExportBySnapshotId,
-  ailaSaveExport,
-  reportErrorResult,
-} from "../router/exports";
+import type { OutputSchema } from "../router/exports";
+import { ailaSaveExport, reportErrorResult } from "../router/exports";
+import { getExistingExportData, getUserEmail } from "./exportHelpers";
 
 const log = aiLogger("exports");
 
@@ -37,11 +31,7 @@ export async function exportQuizDoc({
     data: QuizDocInputData;
   };
 }) {
-  const user = await clerkClient.users.getUser(ctx.auth.userId);
-  const userEmail = user?.emailAddresses[0]?.emailAddress;
-  const exportType =
-    input.data.quizType === "exit" ? "EXIT_QUIZ_DOC" : "STARTER_QUIZ_DOC";
-
+  const userEmail = await getUserEmail(ctx);
   if (!userEmail) {
     return {
       error: new Error("User email not found"),
@@ -49,39 +39,17 @@ export async function exportQuizDoc({
     };
   }
 
-  const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-  const lessonSnapshot = await lessonSnapshots.getOrSaveSnapshot({
-    userId: ctx.auth.userId,
-    chatId: input.chatId,
-    messageId: input.messageId,
-    snapshot: input.lessonSnapshot,
-    trigger: "EXPORT_BY_USER",
-  });
-
-  Sentry.addBreadcrumb({
-    category: "exportQuizDoc",
-    message: "Got or saved snapshot",
-    data: { lessonSnapshot },
-  });
+  const exportType =
+    input.data.quizType === "exit" ? "EXIT_QUIZ_DOC" : "STARTER_QUIZ_DOC";
 
-  const exportData = await ailaGetExportBySnapshotId({
-    prisma: ctx.prisma,
-    snapshotId: lessonSnapshot.id,
+  const { exportData, lessonSnapshot } = await getExistingExportData({
+    ctx,
+    input,
     exportType,
   });
 
-  Sentry.addBreadcrumb({
-    category: "exportQuizDoc",
-    message: "Got export data",
-    data: { exportData },
-  });
-
   if (exportData) {
-    const output: OutputSchema = {
-      link: exportData.gdriveFileUrl,
-      canViewSourceDoc: exportData.userCanViewGdriveFile,
-    };
-    return output;
+    return exportData;
   }
 
   /**
diff --git a/packages/api/src/export/exportWorksheets.ts b/packages/api/src/export/exportWorksheets.ts
index 45e9785fa..4ead33d65 100644
--- a/packages/api/src/export/exportWorksheets.ts
+++ b/packages/api/src/export/exportWorksheets.ts
@@ -1,19 +1,13 @@
 import type { SignedInAuthObject } from "@clerk/backend/internal";
-import { clerkClient } from "@clerk/nextjs/server";
-import { LessonSnapshots } from "@oakai/core";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { exportDocsWorksheet } from "@oakai/exports";
 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,
-  reportErrorResult,
-} from "../router/exports";
+import type { OutputSchema } from "../router/exports";
+import { ailaSaveExport, reportErrorResult } from "../router/exports";
+import { getExistingExportData, getUserEmail } from "./exportHelpers";
 
 const log = aiLogger("exports");
 
@@ -31,9 +25,7 @@ export async function exportWorksheets({
     prisma: PrismaClientWithAccelerate;
   };
 }) {
-  const user = await clerkClient.users.getUser(ctx.auth.userId);
-  const userEmail = user?.emailAddresses[0]?.emailAddress;
-  const exportType = "WORKSHEET_SLIDES";
+  const userEmail = await getUserEmail(ctx);
 
   if (!userEmail) {
     return {
@@ -41,40 +33,16 @@ export async function exportWorksheets({
       message: "User email not found",
     };
   }
+  const exportType = "WORKSHEET_SLIDES";
 
-  const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-  const lessonSnapshot = await lessonSnapshots.getOrSaveSnapshot({
-    userId: ctx.auth.userId,
-    chatId: input.chatId,
-    messageId: input.messageId,
-    snapshot: input.data,
-    trigger: "EXPORT_BY_USER",
-  });
-
-  Sentry.addBreadcrumb({
-    category: "exportWorksheetDocs",
-    message: "Got or saved snapshot",
-    data: { lessonSnapshot },
-  });
-
-  const exportData = await ailaGetExportBySnapshotId({
-    prisma: ctx.prisma,
-    snapshotId: lessonSnapshot.id,
+  const { exportData, lessonSnapshot } = await getExistingExportData({
+    ctx,
+    input,
     exportType,
   });
 
-  Sentry.addBreadcrumb({
-    category: "exportWorksheetDocs",
-    message: "Got export data",
-    data: { exportData },
-  });
-
   if (exportData) {
-    const output: OutputSchema = {
-      link: exportData.gdriveFileUrl,
-      canViewSourceDoc: exportData.userCanViewGdriveFile,
-    };
-    return output;
+    return exportData;
   }
 
   /**
diff --git a/packages/api/src/router/appSessions.ts b/packages/api/src/router/appSessions.ts
index 8f910370e..29f9042a6 100644
--- a/packages/api/src/router/appSessions.ts
+++ b/packages/api/src/router/appSessions.ts
@@ -1,7 +1,6 @@
 import type { SignedInAuthObject } from "@clerk/backend/internal";
 import { clerkClient } from "@clerk/nextjs/server";
 import { demoUsers } from "@oakai/core";
-import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
 import { rateLimits } from "@oakai/core/src/utils/rateLimiting/rateLimit";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
 import type { Prisma, PrismaClientWithAccelerate } from "@oakai/db";
@@ -80,6 +79,7 @@ export async function getChat(id: string, prisma: PrismaClientWithAccelerate) {
   const chatRecord = await prisma.appSession.findUnique({
     where: {
       id: id,
+      deletedAt: null,
     },
   });
   if (!chatRecord) {
@@ -206,6 +206,7 @@ export const appSessionsRouter = router({
         "app_sessions"
       WHERE
         "user_id" = ${userId} AND "app_id" = 'lesson-planner'
+        AND "deleted_at" IS NULL
       ORDER BY
         "updated_at" DESC
     `;
@@ -246,22 +247,27 @@ export const appSessionsRouter = router({
       const { userId } = ctx.auth;
       const { id } = input;
 
-      await ctx.prisma.appSession.deleteMany({
+      await ctx.prisma.appSession.update({
         where: {
           id,
           appId: "lesson-planner",
           userId,
         },
+        data: {
+          deletedAt: new Date(),
+        },
       });
     }),
   deleteAllChats: protectedProcedure.mutation(async ({ ctx }) => {
     const { userId } = ctx.auth;
-
-    await ctx.prisma.appSession.deleteMany({
+    await ctx.prisma.appSession.updateMany({
       where: {
         userId,
         appId: "lesson-planner",
       },
+      data: {
+        deletedAt: new Date(),
+      },
     });
   }),
   shareChat: protectedProcedure
@@ -279,6 +285,7 @@ export const appSessionsRouter = router({
           id,
           userId,
           appId: "lesson-planner",
+          deletedAt: null,
         },
       });
 
diff --git a/packages/api/src/router/chats.ts b/packages/api/src/router/chats.ts
index 403dc29fb..c63158839 100644
--- a/packages/api/src/router/chats.ts
+++ b/packages/api/src/router/chats.ts
@@ -45,7 +45,7 @@ export const chatsRouter = router({
       const { id } = input;
 
       const session = await prisma?.appSession.findUnique({
-        where: { id },
+        where: { id, deletedAt: null },
       });
 
       if (!session) {
@@ -72,6 +72,7 @@ export const chatsRouter = router({
       where: {
         userId,
         appId: "lesson-planner",
+        deletedAt: null,
       },
     });
 
diff --git a/packages/api/src/router/exports.ts b/packages/api/src/router/exports.ts
index 24ef6a433..e7eda2240 100644
--- a/packages/api/src/router/exports.ts
+++ b/packages/api/src/router/exports.ts
@@ -1,6 +1,5 @@
 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 type { PrismaClientWithAccelerate } from "@oakai/db";
 import {
@@ -8,7 +7,6 @@ import {
   exportDocQuizSchema,
   exportSlidesFullLessonSchema,
   exportDocsWorksheetSchema,
-  exportQuizDesignerSlides,
 } from "@oakai/exports";
 import { exportableQuizAppStateSchema } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
@@ -18,8 +16,10 @@ import { kv } from "@vercel/kv";
 import { z } from "zod";
 
 import { exportAdditionalMaterialsDoc } from "../export/exportAdditionalMaterialsDoc";
+import { getExistingExportData } from "../export/exportHelpers";
 import { exportLessonPlan } from "../export/exportLessonPlan";
 import { exportLessonSlides } from "../export/exportLessonSlides";
+import { exportQuizDesignerSlidesWrapper } from "../export/exportQuizDesignerSlides";
 import { exportQuizDoc } from "../export/exportQuizDoc";
 import { exportWorksheets } from "../export/exportWorksheets";
 import { protectedProcedure } from "../middleware/auth";
@@ -178,10 +178,6 @@ const outputSchema = z.union([
 ]);
 export type OutputSchema = z.infer<typeof outputSchema>;
 
-/**
- * @todo refactor this router to for less duplication
- */
-
 export const exportsRouter = router({
   exportLessonSlides: protectedProcedure
     .input(
@@ -214,28 +210,15 @@ export const exportsRouter = router({
     )
     .mutation(async ({ input, ctx }) => {
       try {
-        const userId = ctx.auth.userId;
-        const { chatId, data, messageId } = input;
-        const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-        const { id: snapshotId } = await lessonSnapshots.getOrSaveSnapshot({
-          userId,
-          chatId,
-          snapshot: data,
-          trigger: "EXPORT_BY_USER",
-          messageId,
+        const exportType = "LESSON_PLAN_DOC";
+        const { exportData } = await getExistingExportData({
+          ctx,
+          input,
+          exportType,
         });
 
-        const exportData = await ailaGetExportBySnapshotId({
-          prisma: ctx.prisma,
-          snapshotId,
-          exportType: "LESSON_PLAN_DOC",
-        });
         if (exportData) {
-          const output: OutputSchema = {
-            link: exportData.gdriveFileUrl,
-            canViewSourceDoc: exportData.userCanViewGdriveFile,
-          };
-          return output;
+          return exportData;
         }
       } catch (error) {
         log.error("Error checking if download exists:", error);
@@ -256,28 +239,16 @@ export const exportsRouter = router({
     )
     .mutation(async ({ input, ctx }) => {
       try {
-        const userId = ctx.auth.userId;
-        const { chatId, data, messageId } = input;
-        const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-        const { id: snapshotId } = await lessonSnapshots.getOrSaveSnapshot({
-          userId,
-          chatId,
-          snapshot: data,
-          trigger: "EXPORT_BY_USER",
-          messageId,
-        });
         // find the latest export for this snapshot
-        const exportData = await ailaGetExportBySnapshotId({
-          prisma: ctx.prisma,
-          snapshotId,
-          exportType: "LESSON_SLIDES_SLIDES",
+        const exportType = "LESSON_SLIDES_SLIDES";
+        const { exportData } = await getExistingExportData({
+          ctx,
+          input,
+          exportType,
         });
+
         if (exportData) {
-          const output: OutputSchema = {
-            link: exportData.gdriveFileUrl,
-            canViewSourceDoc: exportData.userCanViewGdriveFile,
-          };
-          return output;
+          return exportData;
         }
       } catch (error) {
         log.error("Error checking if download exists:", error);
@@ -299,106 +270,9 @@ export const exportsRouter = router({
     .output(outputSchema)
     .mutation(async ({ input, ctx }) => {
       try {
-        const { userId } = ctx.auth;
-        const user = await clerkClient.users.getUser(userId);
-        const userEmail = user?.emailAddresses[0]?.emailAddress;
-        const exportType = "LESSON_SLIDES_SLIDES";
-
-        if (!userEmail) {
-          return {
-            error: new Error("User email not found"),
-            message: "User email not found",
-          };
-        }
-
-        const { chatId, messageId, data: snapshot } = input;
-
-        const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-        const { id: snapshotId } = await lessonSnapshots.getOrSaveSnapshot({
-          userId,
-          chatId,
-          snapshot,
-          trigger: "EXPORT_BY_USER",
-          messageId,
-        });
-
-        Sentry.addBreadcrumb({
-          category: "exportQuizDesignerSlides",
-          message: "Got or saved snapshot",
-          data: { snapshot },
-        });
-
-        const exportData = await qdGetExportBySnapshotId({
-          prisma: ctx.prisma,
-          snapshotId,
-          exportType,
-        });
-
-        Sentry.addBreadcrumb({
-          category: "exportQuizDesignerSlides",
-          message: "Got export data",
-          data: { exportData },
-        });
-
-        if (exportData) {
-          const output: OutputSchema = {
-            link: exportData.gdriveFileUrl,
-            canViewSourceDoc: exportData.userCanViewGdriveFile,
-          };
-          return output;
-        }
-
-        /**
-         * User hasn't yet exported the lesson in this state, so we'll do it now
-         * and store the result in the database
-         */
-
-        const result = await exportQuizDesignerSlides({
-          snapshotId: "lessonSnapshot.id",
-          userEmail,
-          onStateChange: (state) => {
-            log.info(state);
-
-            Sentry.addBreadcrumb({
-              category: "exportWorksheetSlides",
-              message: "Export state change",
-              data: state,
-            });
-          },
-          quiz: input.data,
-        });
-
-        Sentry.addBreadcrumb({
-          category: "exportLessonSlides",
-          message: "Got export result",
-          data: { result },
-        });
-
-        if ("error" in result) {
-          reportErrorResult(result, input);
-          return {
-            error: result.error,
-            message: "Failed to export lesson",
-          };
-        }
-
-        const { data } = result;
-
-        await qdSaveExport({
-          auth: ctx.auth,
-          prisma: ctx.prisma,
-          snapshotId,
-          exportType,
-          data: result.data,
-        });
-
-        const output: OutputSchema = {
-          link: data.fileUrl,
-          canViewSourceDoc: data.userCanViewGdriveFile,
-        };
-        return output;
+        return await exportQuizDesignerSlidesWrapper({ input, ctx });
       } catch (error) {
-        const message = "Failed to export lesson";
+        const message = "Failed to export quiz designer slides";
         reportErrorResult({ error, message }, input);
         return {
           error,
@@ -420,7 +294,7 @@ export const exportsRouter = router({
       try {
         return await exportAdditionalMaterialsDoc({ input, ctx });
       } catch (error) {
-        const message = "Failed to export lesson";
+        const message = "Failed to export additional materials";
         reportErrorResult({ error, message }, input);
         return {
           error,
@@ -438,31 +312,20 @@ export const exportsRouter = router({
     )
     .mutation(async ({ input, ctx }) => {
       try {
-        const userId = ctx.auth.userId;
-        const { chatId, data: snapshot, messageId } = input;
-        const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-        const { id: snapshotId } = await lessonSnapshots.getOrSaveSnapshot({
-          userId,
-          chatId,
-          snapshot,
-          trigger: "EXPORT_BY_USER",
-          messageId,
-        });
-        const exportData = await ailaGetExportBySnapshotId({
-          prisma: ctx.prisma,
-          snapshotId,
-          exportType: "ADDITIONAL_MATERIALS_DOCS",
+        const exportType = "ADDITIONAL_MATERIALS_DOCS";
+        const { exportData } = await getExistingExportData({
+          ctx,
+          input,
+          exportType,
         });
+
         if (exportData) {
-          const output: OutputSchema = {
-            link: exportData.gdriveFileUrl,
-            canViewSourceDoc: exportData.userCanViewGdriveFile,
-          };
-          return output;
+          return exportData;
         }
       } catch (error) {
         log.error("Error checking if download exists:", error);
-        const message = "Failed to check if download exists";
+        const message =
+          "Failed to check if additional materials download exists";
         return {
           error,
           message,
@@ -500,27 +363,15 @@ export const exportsRouter = router({
     )
     .mutation(async ({ input, ctx }) => {
       try {
-        const userId = ctx.auth.userId;
-        const { chatId, data, messageId } = input;
-        const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-        const { id: snapshotId } = await lessonSnapshots.getOrSaveSnapshot({
-          userId,
-          chatId,
-          snapshot: data,
-          trigger: "EXPORT_BY_USER",
-          messageId,
-        });
-        const exportData = await ailaGetExportBySnapshotId({
-          prisma: ctx.prisma,
-          snapshotId,
-          exportType: "WORKSHEET_SLIDES",
+        const exportType = "WORKSHEET_SLIDES";
+        const { exportData } = await getExistingExportData({
+          ctx,
+          input,
+          exportType,
         });
+
         if (exportData) {
-          const output: OutputSchema = {
-            link: exportData.gdriveFileUrl,
-            canViewSourceDoc: exportData.userCanViewGdriveFile,
-          };
-          return output;
+          return exportData;
         }
       } catch (error) {
         log.error("Error checking if download exists:", error);
@@ -564,30 +415,17 @@ export const exportsRouter = router({
     )
     .mutation(async ({ input, ctx }) => {
       try {
-        const userId = ctx.auth.userId;
-        const { chatId, data, lessonSnapshot, messageId } = input;
-        const lessonSnapshots = new LessonSnapshots(ctx.prisma);
-        const { id: snapshotId } = await lessonSnapshots.getOrSaveSnapshot({
-          userId,
-          chatId,
-          snapshot: lessonSnapshot,
-          trigger: "EXPORT_BY_USER",
-          messageId,
-        });
         const exportType =
-          data.quizType === "exit" ? "EXIT_QUIZ_DOC" : "STARTER_QUIZ_DOC";
+          input.data.quizType === "exit" ? "EXIT_QUIZ_DOC" : "STARTER_QUIZ_DOC";
 
-        const exportData = await ailaGetExportBySnapshotId({
-          prisma: ctx.prisma,
-          snapshotId,
+        const { exportData } = await getExistingExportData({
+          ctx,
+          input,
           exportType,
         });
+
         if (exportData) {
-          const output: OutputSchema = {
-            link: exportData.gdriveFileUrl,
-            canViewSourceDoc: exportData.userCanViewGdriveFile,
-          };
-          return output;
+          return exportData;
         }
       } catch (error) {
         log.error("Error checking if download exists:", error);
diff --git a/packages/api/src/router/generations.ts b/packages/api/src/router/generations.ts
index 70fd77857..bebcd1469 100644
--- a/packages/api/src/router/generations.ts
+++ b/packages/api/src/router/generations.ts
@@ -6,16 +6,14 @@ import {
   serializeGeneration,
   serializedGenerationSchema,
 } from "@oakai/core/src/models/serializers";
-import type {
-  GenerationPart} from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 import {
   generationPartSchema,
   generationPartUserTweakedSchema,
 } from "@oakai/core/src/types";
 import { sendQuizFeedbackEmail } from "@oakai/core/src/utils/sendQuizFeedbackEmail";
 import { requestGenerationWorker } from "@oakai/core/src/workers/generations/requestGeneration";
-import { structuredLogger as logger } from "@oakai/logger";
-import { aiLogger } from "@oakai/logger";
+import { aiLogger, structuredLogger as logger } from "@oakai/logger";
 import { TRPCError } from "@trpc/server";
 import { Redis } from "@upstash/redis";
 import { waitUntil } from "@vercel/functions";
diff --git a/packages/api/src/router/lesson.ts b/packages/api/src/router/lesson.ts
index 06ae3154e..11b98fd36 100644
--- a/packages/api/src/router/lesson.ts
+++ b/packages/api/src/router/lesson.ts
@@ -23,6 +23,8 @@ type CustomError = {
   code?: number;
 };
 
+type LessonWithSnippetsType = z.infer<typeof LessonWithSnippets>;
+
 export const lessonRouter = router({
   retrieve: protectedProcedure
     .input(
@@ -49,14 +51,14 @@ export const lessonRouter = router({
     )
     .output(z.array(LessonWithSnippets))
     .query(async ({ ctx, input }) => {
-      // FIXME make this a slug based search
+      // TODO make this a slug based search
       const foundLessons = await new Lessons(ctx.prisma).searchByTranscript(
         input.q,
         input.keyStage,
         input.subject,
         5,
       );
-      return foundLessons as LessonWithSnippets[];
+      return foundLessons as LessonWithSnippetsType[];
     }),
   searchByTextSimilarity: protectedProcedure
     .input(
@@ -99,7 +101,7 @@ export const lessonRouter = router({
 
       return res.map(({ slug, title, content }) => {
         content = content as Content;
-        const description = (content?.lessonDescription || "") as string;
+        const description = (content?.lessonDescription ?? "") as string;
         return {
           slug,
           title,
@@ -160,7 +162,7 @@ export const lessonRouter = router({
         },
       });
 
-      if (!res || !res.summaries[0]) {
+      if (!res?.summaries?.[0]) {
         throw new TRPCError({
           message: "Lesson not found",
           code: "NOT_FOUND",
@@ -218,7 +220,7 @@ export const lessonRouter = router({
         where: { lessonId: lesson.id, variant: "ORIGINAL" },
         cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
       });
-      if (!transcript || !transcript.content) {
+      if (!transcript?.content) {
         throw new TRPCError({
           message: "Transcript not found",
           code: "NOT_FOUND",
diff --git a/packages/api/src/router/testSupport/prepareUser.ts b/packages/api/src/router/testSupport/prepareUser.ts
index 9e7af68da..4059173a5 100644
--- a/packages/api/src/router/testSupport/prepareUser.ts
+++ b/packages/api/src/router/testSupport/prepareUser.ts
@@ -15,7 +15,7 @@ const log = aiLogger("testing");
 const branch = process.env.VERCEL_GIT_COMMIT_REF ?? os.hostname();
 
 const GENERATIONS_PER_24H = parseInt(
-  process.env.RATELIMIT_GENERATIONS_PER_24H || "120",
+  process.env.RATELIMIT_GENERATIONS_PER_24H ?? "120",
   10,
 );
 
@@ -95,7 +95,7 @@ const generateEmailAddress = (personaName: keyof typeof personas) => {
     // All users use the "test@thenational.academy" mailbox with a `+` alias
     "test",
     // Replace non-alphanumeric characters with -
-    branch.replace(/\W+/g, "-"),
+    branch.replace(/\W+/g, "-").slice(-15),
     // A new login for each persona
     personaName,
     // Allows signing in with the email_code strategy
@@ -120,7 +120,7 @@ const deleteOldTestUser = async () => {
     return;
   }
 
-  const users = testUsers.sort(
+  const users = testUsers.toSorted(
     (a, b) =>
       new Date(a.lastActiveAt ?? a.createdAt).getTime() -
       new Date(b.lastActiveAt ?? b.createdAt).getTime(),
@@ -143,7 +143,7 @@ const deleteOldTestUser = async () => {
         log.info(
           `${userToDelete.primaryEmailAddress?.emailAddress} already deleted, retrying`,
         );
-        deleteOldTestUser();
+        await deleteOldTestUser();
       } else {
         throw e;
       }
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
index 29e64f0c8..024b974bd 100644
--- a/packages/api/tsconfig.json
+++ b/packages/api/tsconfig.json
@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src", "index.ts", "transformer.ts"]
+  "include": ["src", "index.ts", "transformer.ts"],
+  "compilerOptions": {
+    "baseUrl": "./src"
+  }
 }
diff --git a/packages/core/.eslintrc.cjs b/packages/core/.eslintrc.cjs
deleted file mode 100644
index 9526c3c79..000000000
--- a/packages/core/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["eslint-config-custom"],
-  parserOptions: {
-    project: __dirname + "/tsconfig.json",
-  },
-};
diff --git a/packages/core/index.ts b/packages/core/index.ts
index 597d7e888..d4a2266b6 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -11,8 +11,6 @@ import { generateAllLessonPlans } from "./src/functions/lessonPlan/generateAll";
 import { processLessonPlan } from "./src/functions/lessonPlan/process";
 import { embedLessonSummary } from "./src/functions/lessonSummary/embed";
 import { embedAllLessonSummaries } from "./src/functions/lessonSummary/embedAll";
-import { addIdsToMessages } from "./src/functions/migrations/addIdsToMessages";
-import { kvChatsToPrisma } from "./src/functions/migrations/kvChatsToPrisma";
 import { embedAllQuizAnswers } from "./src/functions/quizAnswer/embedAll";
 import { generateQuizAnswerEmbeddings } from "./src/functions/quizAnswer/generateQuizAnswerEmbeddings";
 import { embedAllQuizQuestions } from "./src/functions/quizQuestion/embedAll";
@@ -63,8 +61,6 @@ export const functions = [
   processLessonPlan,
   generatePlanForLesson,
   generateAllLessonPlans,
-  kvChatsToPrisma,
-  addIdsToMessages,
   notifyModeration,
   notifyRateLimit,
   notifyUserBan,
diff --git a/packages/core/package.json b/packages/core/package.json
index 17b7892ac..025455faa 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -6,6 +6,13 @@
   "license": "ISC",
   "author": "",
   "main": "./index.ts",
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "rules": {}
+  },
   "scripts": {
     "admin": "open http://localhost:8288",
     "check": "tsc --noEmit",
@@ -15,7 +22,7 @@
     "doppler:run:dev": "doppler run -c dev --silent",
     "doppler:run:prd": "doppler run -c prd --silent",
     "doppler:run:stg": "doppler run -c stg --silent",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "eslint .",
     "process:answersAndDistractors": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/batchAnswersAndDistractorsForJudgement.ts",
     "process:createSnippetsForNewLessons": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/import-new-lessons/createSnippetsForNewLessons.ts",
     "process:importNewLessons": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/scripts/import-new-lessons/importNewLessons.ts",
@@ -64,5 +71,6 @@
   "devDependencies": {
     "@oakai/prettier-config": "*",
     "inngest-cli": "^0.29.0"
-  }
+  },
+  "type": "module"
 }
diff --git a/packages/core/src/analytics/posthogAiBetaServerClient/index.ts b/packages/core/src/analytics/posthogAiBetaServerClient/index.ts
index f5840a200..5d1725c75 100644
--- a/packages/core/src/analytics/posthogAiBetaServerClient/index.ts
+++ b/packages/core/src/analytics/posthogAiBetaServerClient/index.ts
@@ -7,7 +7,7 @@ import {
 } from "./featureFlagEvaluation";
 
 const host = process.env.NEXT_PUBLIC_POSTHOG_HOST as string;
-const apiKey = process.env.NEXT_PUBLIC_POSTHOG_API_KEY || "*";
+const apiKey = process.env.NEXT_PUBLIC_POSTHOG_API_KEY ?? "*";
 const personalApiKey = process.env.POSTHOG_PERSONAL_KEY_FLAGS;
 invariant(personalApiKey, "POSTHOG_PERSONAL_KEY_FLAGS is required");
 
diff --git a/packages/core/src/functions/event-types.ts b/packages/core/src/functions/event-types.ts
index 7a83f3cd5..657e0e47d 100644
--- a/packages/core/src/functions/event-types.ts
+++ b/packages/core/src/functions/event-types.ts
@@ -14,8 +14,6 @@ import { generateAllLessonPlansSchema } from "./lessonPlan/generateAll.schema";
 import { processLessonPlanSchema } from "./lessonPlan/process.schema";
 import { embedLessonSummarySchema } from "./lessonSummary/embed.schema";
 import { embedAllLessonSummariesSchema } from "./lessonSummary/embedAll.schema";
-import { addIdsToMessagesSchema } from "./migrations/addIdsToMessages.schema";
-import { kvChatsToPrismaSchema } from "./migrations/kvChatsToPrisma.schema";
 import { embedAllQuizAnswersSchema } from "./quizAnswer/embedAll.schema";
 import { embedQuizAnswerSchema } from "./quizAnswer/generateQuizAnswerEmbeddings.schema";
 import { embedAllQuizQuestionsSchema } from "./quizQuestion/embedAll.schema";
@@ -63,8 +61,6 @@ const schemas = {
   "app/lessonPlan.embedPart": embedLessonPlanPartSchema,
   "app/snippet.embedAll": embedAllSnippetsSchema,
   "app/snippet.generateForAllQuestions": generateSnippetsForAllQuestionsSchema,
-  "app/migrations.kvChatsToPrisma": kvChatsToPrismaSchema,
-  "app/migrations.addIdsToMessages": addIdsToMessagesSchema,
   "app/slack.notifyRateLimit": notifyRateLimitSchema,
   "app/slack.notifyModeration": notifyModerationSchema,
   "app/slack.notifyUserBan": notifyUserBanSchema,
diff --git a/packages/core/src/functions/migrations/addIdsToMessages.schema.ts b/packages/core/src/functions/migrations/addIdsToMessages.schema.ts
deleted file mode 100644
index f0fe7388f..000000000
--- a/packages/core/src/functions/migrations/addIdsToMessages.schema.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { z } from "zod";
-
-export const addIdsToMessagesSchema = {
-  data: z.object({
-    dryRun: z.boolean().default(true),
-  }),
-};
diff --git a/packages/core/src/functions/migrations/addIdsToMessages.ts b/packages/core/src/functions/migrations/addIdsToMessages.ts
deleted file mode 100644
index 5ca7c4577..000000000
--- a/packages/core/src/functions/migrations/addIdsToMessages.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Prisma, prisma } from "@oakai/db";
-import crypto from "crypto";
-import { z } from "zod";
-
-import { inngest } from "../../inngest";
-import { addIdsToMessagesSchema } from "./addIdsToMessages.schema";
-
-const chatSchema = z
-  .object({
-    messages: z.array(
-      z
-        .object({
-          id: z.string().optional(),
-          content: z.string(),
-        })
-        .passthrough(),
-    ),
-  })
-  .passthrough();
-
-/**
- * Generate a unique message ID based on the message content.
- */
-export function getMessageId(message: { content: string }) {
-  return crypto
-    .createHash("sha256")
-    .update(message.content)
-    .digest("hex")
-    .slice(0, 16);
-}
-
-export const addIdsToMessages = inngest.createFunction(
-  {
-    name: "Add ids to messages in AppSessions",
-    id: "add-ids-to-messages",
-  },
-  { event: "app/migrations.addIdsToMessages" },
-  async ({ event, step }) => {
-    const args = addIdsToMessagesSchema.data.parse(event.data);
-    const DRY_RUN = args.dryRun;
-
-    if (DRY_RUN) {
-      console.log("Running in dry run mode");
-    }
-
-    async function migrateAppSession(appSession: {
-      id: string;
-      output: Prisma.JsonValue;
-    }) {
-      const parseResult = chatSchema.safeParse(appSession.output);
-      if (!parseResult.success) {
-        console.log(appSession.id, "- Invalid chat schema");
-        console.error(parseResult.error.issues);
-        return;
-      }
-
-      const chat = parseResult.data;
-      const messagesWithoutIds = chat.messages.filter((message) => !message.id);
-
-      if (messagesWithoutIds.length === 0) {
-        console.log(appSession.id, "- No messages without ids");
-        return;
-      }
-
-      console.log(appSession.id, "- Found messages without ids");
-
-      messagesWithoutIds.forEach((message, index) => {
-        const id = getMessageId(message);
-        console.log(appSession.id, "- Adding id to message", index, id);
-        message.id = id;
-      });
-
-      console.log(appSession.id, "- Updating appSession with ids");
-      if (!DRY_RUN) {
-        await prisma.appSession.update({
-          where: {
-            id: appSession.id,
-          },
-          data: {
-            output: chat,
-          },
-        });
-      }
-    }
-
-    let cursor: string | null = null;
-
-    while (true) {
-      cursor = await step.run("Process page", async () => {
-        console.log("Cursor:", cursor);
-        const appSessions: Array<{ id: string; output: Prisma.JsonValue }> =
-          await prisma.appSession.findMany({
-            where: {
-              appId: "lesson-planner",
-              output: { not: Prisma.JsonNull },
-            },
-            select: {
-              id: true,
-              output: true,
-            },
-            ...(cursor ? { cursor: { id: cursor }, skip: 1 } : undefined),
-            take: 20,
-            orderBy: {
-              id: "asc",
-            },
-          });
-
-        const last = appSessions[appSessions.length - 1];
-        if (!last) {
-          console.log("No more appSessions");
-          return null;
-        }
-        console.log(`Found ${appSessions.length} appSessions`);
-
-        await Promise.all(
-          appSessions.map((appSession) => migrateAppSession(appSession)),
-        );
-
-        return last.id;
-      });
-
-      if (!cursor) {
-        break;
-      }
-    }
-
-    console.log("Migration complete");
-  },
-);
diff --git a/packages/core/src/functions/migrations/kvChatsToPrisma.schema.ts b/packages/core/src/functions/migrations/kvChatsToPrisma.schema.ts
deleted file mode 100644
index afe8d582d..000000000
--- a/packages/core/src/functions/migrations/kvChatsToPrisma.schema.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { z } from "zod";
-
-export const kvChatsToPrismaSchema = {
-  data: z.object({
-    dryRun: z.boolean().default(true),
-  }),
-};
diff --git a/packages/core/src/functions/migrations/kvChatsToPrisma.ts b/packages/core/src/functions/migrations/kvChatsToPrisma.ts
deleted file mode 100644
index 7861ad6d8..000000000
--- a/packages/core/src/functions/migrations/kvChatsToPrisma.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { clerkClient } from "@clerk/nextjs/server";
-import { prisma } from "@oakai/db";
-import { kv } from "@vercel/kv";
-import { z } from "zod";
-
-import { LessonPlanSchemaWhilstStreaming } from "../../../../aila/src/protocol/schema";
-import { inngest } from "../../inngest";
-import { kvChatsToPrismaSchema } from "./kvChatsToPrisma.schema";
-
-const chatSchema = z
-  .object({
-    id: z.string(),
-    path: z.string(),
-    title: z.string(),
-    userId: z.string(),
-    lessonPlan: LessonPlanSchemaWhilstStreaming,
-    sharePath: z.string().optional(),
-    createdAt: z.union([z.date(), z.number()]),
-    messages: z.array(
-      z
-        .object({
-          id: z.string().optional(),
-          content: z.string(),
-          role: z.union([
-            z.literal("function"),
-            z.literal("data"),
-            z.literal("user"),
-            z.literal("system"),
-            z.literal("assistant"),
-            z.literal("tool"),
-          ]),
-        })
-        .passthrough(),
-    ),
-  })
-  .passthrough();
-
-export const kvChatsToPrisma = inngest.createFunction(
-  {
-    name: "Migrate chats in kv to prisma AppSessions",
-    id: "kv-chats-to-prisma",
-  },
-  { event: "app/migrations.kvChatsToPrisma" },
-  async ({ event, step }) => {
-    const args = kvChatsToPrismaSchema.data.parse(event.data);
-    const DRY_RUN = args.dryRun;
-
-    if (DRY_RUN) {
-      console.log("Running in dry run mode");
-    }
-
-    const limit = 50;
-    let offset: number | null = 0;
-
-    while (offset !== null) {
-      offset = await step.run("Move KV chats to Prisma", async () => {
-        if (offset === null) {
-          return null;
-        }
-
-        const clerkResponse = await clerkClient.users.getUserList({
-          limit,
-          offset,
-        });
-
-        const users = clerkResponse.data;
-        console.log(`Found ${users.length} users`);
-
-        if (users.length === 0) {
-          return null;
-        }
-
-        for (const user of users) {
-          console.log(user.id, "- Migrating chats");
-
-          const chatIds: string[] = await kv.zrange(
-            `user:chat:${user.id}`,
-            0,
-            -1,
-          );
-
-          if (chatIds.length === 0) {
-            console.log(user.id, "- No chats to migrate for user");
-            continue;
-          }
-
-          const pipeline = kv.pipeline();
-
-          for (const chat of chatIds) {
-            pipeline.hgetall(chat);
-          }
-
-          const results: {
-            id: string;
-            userId: string;
-          }[] = await pipeline.exec();
-
-          for (const chat of results) {
-            if (!chat) {
-              continue;
-            }
-
-            const appSession = await prisma.appSession.findUnique({
-              where: {
-                id: chat.id,
-              },
-            });
-
-            if (appSession) {
-              console.log(chat.id, "- AppSession exists in prisma");
-              console.log(chat.id, "- Deleting chat from KV");
-              if (!DRY_RUN) {
-                await kv.zrem(`user:chat:${user.id}`, `chat:${chat.id}`);
-                await kv.del(chat.id);
-              }
-              continue;
-            }
-
-            const parseResult = chatSchema.safeParse(chat);
-            if (parseResult.success === false) {
-              console.log(
-                chat.id,
-                "- Chat schema validation failed. Skipping import",
-                parseResult.error.issues,
-              );
-              continue;
-            }
-
-            console.log(chat.id, "- Creating AppSession for chat");
-            if (!DRY_RUN) {
-              await prisma.appSession.create({
-                data: {
-                  id: chat.id,
-                  userId: chat.userId,
-                  appId: "lesson-planner",
-                  output: chat,
-                },
-              });
-            }
-
-            console.log(chat.id, "- Deleting chat from KV");
-            if (!DRY_RUN) {
-              await kv.zrem(`user:chat:${user.id}`, `chat:${chat.id}`);
-              await kv.del(chat.id);
-            }
-          }
-        }
-
-        return offset + limit;
-      });
-    }
-  },
-);
diff --git a/packages/core/src/models/apps.ts b/packages/core/src/models/apps.ts
index 4c9b6563a..59ba0007d 100644
--- a/packages/core/src/models/apps.ts
+++ b/packages/core/src/models/apps.ts
@@ -46,6 +46,7 @@ export class Apps {
       where: {
         id: sessionId,
         userId: userId,
+        deletedAt: null,
         output: {
           not: Prisma.AnyNull,
         },
@@ -59,6 +60,7 @@ export class Apps {
     return this.prisma.appSession.findMany({
       where: {
         userId: userId,
+        deletedAt: null,
         output: {
           not: Prisma.AnyNull,
         },
diff --git a/packages/core/src/models/demoUsers.ts b/packages/core/src/models/demoUsers.ts
index db7ef64aa..adb292646 100644
--- a/packages/core/src/models/demoUsers.ts
+++ b/packages/core/src/models/demoUsers.ts
@@ -1,6 +1,6 @@
 import type { User } from "@clerk/nextjs/server";
 
-const DEVELOPMENT_USER_REGION = process.env.DEVELOPMENT_USER_REGION || null;
+const DEVELOPMENT_USER_REGION = process.env.DEVELOPMENT_USER_REGION ?? null;
 if (process.env.NODE_ENV === "development" && !DEVELOPMENT_USER_REGION) {
   throw new Error("DEVELOPMENT_USER_REGION is required for development");
 }
@@ -62,7 +62,7 @@ class DemoUsers {
   }
 
   isDemoStatusSet(user: LabsUser): user is UserWithDemoStatus {
-    const labsMetadata = user.publicMetadata.labs || {};
+    const labsMetadata = user.publicMetadata.labs ?? {};
     return "isDemoUser" in labsMetadata && labsMetadata.isDemoUser !== null;
   }
 
diff --git a/packages/core/src/models/generations.ts b/packages/core/src/models/generations.ts
index c256a015f..6c0770d57 100644
--- a/packages/core/src/models/generations.ts
+++ b/packages/core/src/models/generations.ts
@@ -2,10 +2,9 @@ import type {
   Generation,
   ModerationType,
   Prisma,
-  PrismaClientWithAccelerate} from "@oakai/db";
-import {
-  GenerationStatus
+  PrismaClientWithAccelerate,
 } from "@oakai/db";
+import { GenerationStatus } from "@oakai/db";
 import type { StructuredLogger } from "@oakai/logger";
 import { structuredLogger } from "@oakai/logger";
 import type { Logger as InngestLogger } from "inngest/middleware/logger";
@@ -13,7 +12,7 @@ import { omit } from "remeda";
 import { Md5 } from "ts-md5";
 
 export type PromptInputs = {
-  [key: string]: unknown | undefined;
+  [key: string]: unknown;
   fact?: string;
   knowledge?: string;
   transcript?: string;
diff --git a/packages/core/src/models/lessonPlans.ts b/packages/core/src/models/lessonPlans.ts
index c71e02efd..6b72fdebc 100644
--- a/packages/core/src/models/lessonPlans.ts
+++ b/packages/core/src/models/lessonPlans.ts
@@ -47,8 +47,8 @@ type LessonPlanWithParts = LessonPlan & {
 };
 
 export class LessonPlans {
-  private _rag: RAG;
-  private _prisma: PrismaClientWithAccelerate;
+  private readonly _rag: RAG;
+  private readonly _prisma: PrismaClientWithAccelerate;
   constructor(private readonly prisma: PrismaClientWithAccelerate) {
     this._prisma = prisma;
     this._rag = new RAG(this._prisma, { chatId: "none" });
@@ -137,9 +137,7 @@ export class LessonPlans {
       lessonPlanJsonSchema: JSON.stringify(LessonPlanJsonSchema),
       llmResponseJsonSchema: JSON.stringify(LLMResponseJsonSchema),
       isUsingStructuredOutput:
-        process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true"
-          ? true
-          : false,
+        process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true",
     });
 
     const systemPrompt = compiledTemplate;
diff --git a/packages/core/src/models/lessonSnapshots.ts b/packages/core/src/models/lessonSnapshots.ts
index 330344254..fc5f79074 100644
--- a/packages/core/src/models/lessonSnapshots.ts
+++ b/packages/core/src/models/lessonSnapshots.ts
@@ -105,7 +105,7 @@ export class LessonSnapshots {
     messageId: string;
     snapshot: Snapshot;
     trigger: LessonSnapshotTrigger;
-  }) {
+  }): Promise<LessonSnapshot> {
     /**
      * Prisma types complained when passing the JSON schema directly to the Prisma
      */
diff --git a/packages/core/src/models/lessonSummaries.ts b/packages/core/src/models/lessonSummaries.ts
index edcae0b98..8da5fb698 100644
--- a/packages/core/src/models/lessonSummaries.ts
+++ b/packages/core/src/models/lessonSummaries.ts
@@ -1,4 +1,8 @@
-import type { 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";
@@ -24,9 +28,9 @@ interface FilterOptions {
   subject_id?: object;
 }
 export class LessonSummaries {
-  private _rag: RAG;
-  private _prisma: PrismaClientWithAccelerate;
-  constructor(private readonly prisma: PrismaClientWithAccelerate) {
+  private readonly _rag: RAG;
+  private readonly _prisma: PrismaClientWithAccelerate;
+  constructor(prisma: PrismaClientWithAccelerate) {
     this._prisma = prisma;
     this._rag = new RAG(this._prisma, { chatId: "none" });
   }
diff --git a/packages/core/src/models/lessons.ts b/packages/core/src/models/lessons.ts
index 358d3fdc9..87c86c779 100644
--- a/packages/core/src/models/lessons.ts
+++ b/packages/core/src/models/lessons.ts
@@ -125,11 +125,11 @@ export class Lessons {
     let transcript;
     if (!lesson.isNewLesson) {
       zLesson = ZLesson.parse(lesson.content);
-      description = zLesson.lessonDescription || lesson.title;
+      description = zLesson.lessonDescription ?? lesson.title;
       transcript = zLesson.video?.captions?.transcript;
     } else {
       zLesson = ZNewLesson.parse(lesson.newLessonContent);
-      description = zLesson.pupilLessonOutcome || lesson.title;
+      description = zLesson.pupilLessonOutcome ?? lesson.title;
       transcript = zLesson.transcriptSentences;
     }
 
@@ -305,7 +305,7 @@ export class Lessons {
     lessonId,
     quizQuestionId,
   }: {
-    question: { answer?: string | string[] | null | undefined };
+    question: { answer?: string | string[] | null };
     answer: string;
     lessonId: string;
     quizQuestionId: string;
diff --git a/packages/core/src/models/moderations.ts b/packages/core/src/models/moderations.ts
index 7f7acb858..c73087306 100644
--- a/packages/core/src/models/moderations.ts
+++ b/packages/core/src/models/moderations.ts
@@ -34,6 +34,7 @@ export class Moderations {
     appSessionId,
     messageId,
     categories,
+    scores,
     justification,
     lesson,
   }: {
@@ -41,6 +42,7 @@ export class Moderations {
     appSessionId: string;
     messageId: string;
     categories: ModerationResult["categories"];
+    scores: ModerationResult["scores"];
     justification?: string;
     lesson: Snapshot;
   }): Promise<Moderation> {
@@ -58,6 +60,7 @@ export class Moderations {
         userId,
         categories,
         justification,
+        scores,
         appSessionId,
         messageId,
         lessonSnapshotId,
diff --git a/packages/core/src/models/prompts.ts b/packages/core/src/models/prompts.ts
index d7317c6fe..5542b27d5 100644
--- a/packages/core/src/models/prompts.ts
+++ b/packages/core/src/models/prompts.ts
@@ -3,7 +3,7 @@ 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 type { BaseMessage} from "langchain/schema";
+import type { BaseMessage } from "langchain/schema";
 import { SystemMessage } from "langchain/schema";
 import untruncateJson from "untruncate-json";
 
@@ -196,7 +196,7 @@ export class LLMRefusalError extends Error {
 
   constructor(message: string, meta: Partial<CompletionMeta>) {
     super(message);
-    this.name = "LLMCompletionError";
+    this.name = "LLMRefusalError";
     this.completionMeta = meta;
   }
 }
diff --git a/packages/core/src/models/safetyViolations.ts b/packages/core/src/models/safetyViolations.ts
index 823a02d67..aca6fbb25 100644
--- a/packages/core/src/models/safetyViolations.ts
+++ b/packages/core/src/models/safetyViolations.ts
@@ -14,11 +14,11 @@ import { inngest } from "../inngest";
 import { UserBannedError } from "./userBannedError";
 
 const ALLOWED_VIOLATIONS = parseInt(
-  process.env.SAFETY_VIOLATIONS_MAX_ALLOWED || "5",
+  process.env.SAFETY_VIOLATIONS_MAX_ALLOWED ?? "5",
   10,
 );
 const CHECK_WINDOW_DAYS = parseInt(
-  process.env.SAFETY_VIOLATION_WINDOW_DAYS || "30",
+  process.env.SAFETY_VIOLATION_WINDOW_DAYS ?? "30",
   10,
 );
 const checkWindowMs = 1000 * 60 * 60 * 24 * CHECK_WINDOW_DAYS;
diff --git a/packages/core/src/prompts/lesson-assistant/variants.ts b/packages/core/src/prompts/lesson-assistant/variants.ts
index beb06c26b..9db309cf5 100644
--- a/packages/core/src/prompts/lesson-assistant/variants.ts
+++ b/packages/core/src/prompts/lesson-assistant/variants.ts
@@ -1,6 +1,6 @@
 import z from "zod";
 
-import type { TemplateProps} from ".";
+import type { TemplateProps } from ".";
 import { getPromptParts } from ".";
 import type { OakPromptDefinition, OakPromptVariant } from "../types";
 
@@ -59,9 +59,7 @@ export const generateVariants = (): OakPromptVariant[] => {
         llmResponseJsonSchema: "<llmResponseJsonSchema>",
         lessonPlan: {},
         isUsingStructuredOutput:
-          process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true"
-            ? true
-            : false,
+          process.env.NEXT_PUBLIC_STRUCTURED_OUTPUTS_ENABLED === "true",
       },
       slug,
     );
diff --git a/packages/core/src/rag/index.ts b/packages/core/src/rag/index.ts
index dc1ba9ed6..9de079da5 100644
--- a/packages/core/src/rag/index.ts
+++ b/packages/core/src/rag/index.ts
@@ -36,7 +36,7 @@ const log = aiLogger("rag");
 
 export class RAG {
   prisma: PrismaClientWithAccelerate;
-  private _chatMeta: OpenAICompletionWithLoggingOptions;
+  private readonly _chatMeta: OpenAICompletionWithLoggingOptions;
   constructor(
     prisma: PrismaClientWithAccelerate,
     chatMeta: OpenAICompletionWithLoggingOptions,
@@ -787,7 +787,7 @@ Thank you and happy classifying!`;
       topN: k,
     });
     const mostRelevantHydrated = rerank.results
-      .sort((a, b) => b.relevanceScore - a.relevanceScore)
+      .toSorted((a, b) => b.relevanceScore - a.relevanceScore)
       .map((r) => {
         const lessonPlan = lessonPlans[r.index];
         if (!lessonPlan) {
diff --git a/packages/core/src/scripts/import-new-lessons/importNewLessons.ts b/packages/core/src/scripts/import-new-lessons/importNewLessons.ts
index e810e92b9..6e3feae4b 100644
--- a/packages/core/src/scripts/import-new-lessons/importNewLessons.ts
+++ b/packages/core/src/scripts/import-new-lessons/importNewLessons.ts
@@ -1,8 +1,7 @@
-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 || "");
+const batchSize = parseInt(process.env.LESSON_QUERY_BATCH_SIZE ?? "");
 const LESSON_QUERY_BATCH_SIZE = Number.isInteger(batchSize) ? batchSize : 10;
 const QUERY_SLEEP_MS = 1000; // Delay between API calls to avoid rate limiting/hammering the db
 const MAX_LESSONS = Infinity; // Set a smaller limit for testing when we don't want all ~10k
diff --git a/packages/core/src/tracing/baseTracing.ts b/packages/core/src/tracing/baseTracing.ts
index 8dbc68bc6..2905b2b3d 100644
--- a/packages/core/src/tracing/baseTracing.ts
+++ b/packages/core/src/tracing/baseTracing.ts
@@ -29,7 +29,7 @@ export function initializeTracer(options: DatadogOptions) {
   const debugMode =
     !isTest && !isLocalDev
       ? true
-      : options.debug || process.env.DD_TRACE_DEBUG === "true";
+      : (options.debug ?? process.env.DD_TRACE_DEBUG === "true");
 
   const logLevel: "debug" | "error" = debugMode ? "debug" : "error";
   if (isTest || isLocalDev) {
@@ -45,23 +45,29 @@ export function initializeTracer(options: DatadogOptions) {
       env: options.env ?? environment,
       service: options.service ?? "oak-ai",
       hostname,
-      logInjection:
-        options.logInjection !== undefined ? options.logInjection : true,
-      runtimeMetrics:
-        options.runtimeMetrics !== undefined ? options.runtimeMetrics : true,
+      logInjection: options.logInjection ?? true,
+      runtimeMetrics: options.runtimeMetrics ?? true,
       sampleRate: options.sampleRate ?? 1,
-      profiling: options.profiling !== undefined ? options.profiling : true,
-      plugins: options.plugins !== undefined ? options.plugins : false,
+      profiling: options.profiling ?? true,
+      plugins: options.plugins ?? false,
       logLevel,
       logger: {
         debug: (message: string | Error) =>
-          log.info(`[dd-trace debug] ${message}`),
+          log.info(
+            `[dd-trace debug] ${typeof message === "string" ? message : message.message}`,
+          ),
         info: (message: string | Error) =>
-          log.info(`[dd-trace info] ${message}`),
+          log.info(
+            `[dd-trace info] ${typeof message === "string" ? message : message.message}`,
+          ),
         warn: (message: string | Error) =>
-          log.info(`[dd-trace warn] ${message}`),
+          log.info(
+            `[dd-trace warn] ${typeof message === "string" ? message : message.message}`,
+          ),
         error: (message: string | Error) =>
-          log.error(`[dd-trace error] ${message}`),
+          log.error(
+            `[dd-trace error] ${typeof message === "string" ? message : message.message}`,
+          ),
       },
     };
     console.log(
diff --git a/packages/core/src/types/export-template.ts b/packages/core/src/types/export-template.ts
deleted file mode 100644
index 1f20062db..000000000
--- a/packages/core/src/types/export-template.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import { z } from "zod";
-
-export const proformaTemplateDataSchema = z.object({
-  lesson_title: z.string(),
-  subject: z.string(),
-  key_stage: z.string(),
-  topic: z.string().optional(),
-  learning_outcome: z.string(),
-  learning_cycle_outcome_1: z.string(),
-  learning_cycle_outcome_2: z.string().optional(),
-  learning_cycle_outcome_3: z.string().optional(),
-  prior_knowledge: z.array(z.string()),
-  misconception_1: z.string(),
-  misconception_2: z.string(),
-  misconception_3: z.string(),
-  keyword_1: z.string(),
-  keyword_2: z.string(),
-  keyword_3: z.string().optional(),
-  keyword_4: z.string().optional(),
-  keyword_5: z.string().optional(),
-  keyword_definition_1: z.string(),
-  keyword_definition_2: z.string(),
-  keyword_definition_3: z.string().optional(),
-  keyword_definition_4: z.string().optional(),
-  keyword_definition_5: z.string().optional(),
-  key_learning_point_1: z.string(),
-  key_learning_point_2: z.string().optional(),
-  key_learning_point_3: z.string().optional(),
-  key_learning_point_4: z.string().optional(),
-  starter_quiz_question_1: z.string(),
-  starter_quiz_question_1_answer_1: z.string(),
-  starter_quiz_question_1_answer_2: z.string(),
-  starter_quiz_question_1_answer_3: z.string(),
-  starter_quiz_question_2: z.string(),
-  starter_quiz_question_2_answer_1: z.string(),
-  starter_quiz_question_2_answer_2: z.string(),
-  starter_quiz_question_2_answer_3: z.string(),
-  starter_quiz_question_3: z.string(),
-  starter_quiz_question_3_answer_1: z.string(),
-  starter_quiz_question_3_answer_2: z.string(),
-  starter_quiz_question_3_answer_3: z.string(),
-  starter_quiz_question_4: z.string(),
-  starter_quiz_question_4_answer_1: z.string(),
-  starter_quiz_question_4_answer_2: z.string(),
-  starter_quiz_question_4_answer_3: z.string(),
-  starter_quiz_question_5: z.string(),
-  starter_quiz_question_5_answer_1: z.string(),
-  starter_quiz_question_5_answer_2: z.string(),
-  starter_quiz_question_5_answer_3: z.string(),
-  starter_quiz_question_6: z.string(),
-  starter_quiz_question_6_answer_1: z.string(),
-  starter_quiz_question_6_answer_2: z.string(),
-  starter_quiz_question_6_answer_3: z.string(),
-  exit_quiz_question_1: z.string(),
-  exit_quiz_question_1_answer_1: z.string(),
-  exit_quiz_question_1_answer_2: z.string(),
-  exit_quiz_question_1_answer_3: z.string(),
-  exit_quiz_question_2: z.string(),
-  exit_quiz_question_2_answer_1: z.string(),
-  exit_quiz_question_2_answer_2: z.string(),
-  exit_quiz_question_2_answer_3: z.string(),
-  exit_quiz_question_3: z.string(),
-  exit_quiz_question_3_answer_1: z.string(),
-  exit_quiz_question_3_answer_2: z.string(),
-  exit_quiz_question_3_answer_3: z.string(),
-  exit_quiz_question_4: z.string(),
-  exit_quiz_question_4_answer_1: z.string(),
-  exit_quiz_question_4_answer_2: z.string(),
-  exit_quiz_question_4_answer_3: z.string(),
-  exit_quiz_question_5: z.string(),
-  exit_quiz_question_5_answer_1: z.string(),
-  exit_quiz_question_5_answer_2: z.string(),
-  exit_quiz_question_5_answer_3: z.string(),
-  exit_quiz_question_6: z.string(),
-  exit_quiz_question_6_answer_1: z.string(),
-  exit_quiz_question_6_answer_2: z.string(),
-  exit_quiz_question_6_answer_3: z.string(),
-
-  learning_cycle_1_title: z.string(),
-  learning_cycle_2_title: z.string(),
-  learning_cycle_3_title: z.string(),
-  learning_cycle_1_text: z.string(),
-  cycle_1_spoken_explanation: z.string(),
-  cycle_1_check_for_understanding_question_1: z.string(),
-  cycle_1_check_for_understanding_question_1_answer_1: z.string(),
-  cycle_1_check_for_understanding_question_1_answer_2: z.string(),
-  cycle_1_check_for_understanding_question_1_answer_3: z.string(),
-
-  cycle_1_check_for_understanding_question_2: z.string(),
-  cycle_1_check_for_understanding_question_2_answer_1: z.string(),
-  cycle_1_check_for_understanding_question_2_answer_2: z.string(),
-  cycle_1_check_for_understanding_question_2_answer_3: z.string(),
-
-  cycle_1_practice: z.string(),
-  cycle_1_feedback: z.string(),
-
-  cycle_2_spoken_explanation: z.string(),
-  cycle_2_check_for_understanding_question_1: z.string(),
-  cycle_2_check_for_understanding_question_1_answer_1: z.string(),
-  cycle_2_check_for_understanding_question_1_answer_2: z.string(),
-  cycle_2_check_for_understanding_question_1_answer_3: z.string(),
-
-  cycle_2_check_for_understanding_question_2: z.string(),
-  cycle_2_check_for_understanding_question_2_answer_1: z.string(),
-  cycle_2_check_for_understanding_question_2_answer_2: z.string(),
-  cycle_2_check_for_understanding_question_2_answer_3: z.string(),
-
-  cycle_2_practice: z.string(),
-  cycle_2_feedback: z.string(),
-
-  cycle_3_spoken_explanation: z.string(),
-  cycle_3_check_for_understanding_question_1: z.string(),
-  cycle_3_check_for_understanding_question_1_answer_1: z.string(),
-  cycle_3_check_for_understanding_question_1_answer_2: z.string(),
-  cycle_3_check_for_understanding_question_1_answer_3: z.string(),
-
-  cycle_3_check_for_understanding_question_2: z.string(),
-  cycle_3_check_for_understanding_question_2_answer_1: z.string(),
-  cycle_3_check_for_understanding_question_2_answer_2: z.string(),
-  cycle_3_check_for_understanding_question_2_answer_3: z.string(),
-
-  cycle_3_practice: z.string(),
-  cycle_3_feedback: z.string(),
-});
-
-export type ProformaTemplateData = z.infer<typeof proformaTemplateDataSchema>;
-
-export const slidesTemplateDataSchema = z.object({
-  lesson_title: z.string(),
-  subject_title: z.string(),
-  key_stage_title: z.string().nullish(),
-  topic_title: z.string().nullish(),
-  learning_outcomes: z.string(),
-  keywords: z.array(z.string()).nullish(),
-  keyword_sentences: z.array(z.string()).nullish(),
-  learning_cycle_1_title: z.string(),
-  learning_cycle_2_title: z.string().nullish(),
-  learning_cycle_3_title: z.string().nullish(),
-  learning_cycle_1_text: z.string(),
-  learning_cycle_1_image_prompt: z.string(),
-
-  learning_cycle_1_title_long: z.string(),
-  learning_cycle_2_title_long: z.string().nullish(),
-  learning_cycle_3_title_long: z.string().nullish(),
-
-  learning_cycle_1_check_question_1_question: z.string(),
-  learning_cycle_1_question_1_check_answer_1: z.string(),
-  learning_cycle_1_question_1_check_answer_2: z.string(),
-  learning_cycle_1_question_1_check_answer_3: z.string(),
-  learning_cycle_1_check_question_2: z.string(),
-  learning_cycle_1_question_2_check_answer_1: z.string(),
-  learning_cycle_1_question_2_check_answer_2: z.string(),
-  learning_cycle_1_question_2_check_answer_3: z.string(),
-
-  learning_cycle_1_practise: z.string().nullish(),
-
-  learning_cycle_2_text: z.string().nullish(),
-  learning_cycle_2_image_prompt: z.string().nullish(),
-  learning_cycle_2_question_1_check_question: z.string().nullish(),
-  learning_cycle_2_question_1_check_answer_1: z.string().nullish(),
-  learning_cycle_2_question_1_check_answer_2: z.string().nullish(),
-  learning_cycle_2_question_1_check_answer_3: z.string().nullish(),
-
-  learning_cycle_2_question_2_check_question: z.string().nullish(),
-  learning_cycle_2_question_2_check_answer_1: z.string().nullish(),
-  learning_cycle_2_question_2_check_answer_2: z.string().nullish(),
-  learning_cycle_2_question_2_check_answer_3: z.string().nullish(),
-
-  learning_cycle_2_practise: z.string().nullish(),
-
-  learning_cycle_3_text: z.string().nullish(),
-  learning_cycle_3_image_prompt: z.string().nullish(),
-
-  learning_cycle_3_question_1_check_question: z.string().nullish(),
-  learning_cycle_3_question_1_check_answer_1: z.string().nullish(),
-  learning_cycle_3_question_1_check_answer_2: z.string().nullish(),
-  learning_cycle_3_question_1_check_answer_3: z.string().nullish(),
-
-  learning_cycle_3_question_2_check_question: z.string().nullish(),
-  learning_cycle_3_question_2_check_answer_1: z.string().nullish(),
-  learning_cycle_3_question_2_check_answer_2: z.string().nullish(),
-  learning_cycle_3_question_2_check_answer_3: z.string().nullish(),
-
-  learning_cycle_3_practise: z.string().nullish(),
-});
-
-export const WARN_IF_MISSING = [
-  "learning_cycle_2_title",
-  "learning_cycle_2_text",
-  "learning_cycle_2_image_prompt",
-  "learning_cycle_2_question_1_check_question",
-  "learning_cycle_2_question_1_check_answer_1",
-  "learning_cycle_2_question_1_check_answer_2",
-  "learning_cycle_2_question_1_check_answer_3",
-  "learning_cycle_2_question_2_check_question",
-  "learning_cycle_2_question_2_check_answer_1",
-  "learning_cycle_2_question_2_check_answer_2",
-  "learning_cycle_2_question_2_check_answer_3",
-  "learning_cycle_2_practise",
-];
-
-export type SlidesTemplateData = z.infer<typeof slidesTemplateDataSchema>;
-
-export const lessonQuizSchema = z.object({
-  lesson_title: z.string(),
-  quiz_type: z.string(),
-  question_1: z.string().nullish(),
-  question_1_answer_a: z.string().nullish(),
-  question_1_answer_b: z.string().nullish(),
-  question_1_answer_c: z.string().nullish(),
-  question_2: z.string().nullish(),
-  question_2_answer_a: z.string().nullish(),
-  question_2_answer_b: z.string().nullish(),
-  question_2_answer_c: z.string().nullish(),
-  question_3: z.string().nullish(),
-  question_3_answer_a: z.string().nullish(),
-  question_3_answer_b: z.string().nullish(),
-  question_3_answer_c: z.string().nullish(),
-  question_4: z.string().nullish(),
-  question_4_answer_a: z.string().nullish(),
-  question_4_answer_b: z.string().nullish(),
-  question_4_answer_c: z.string().nullish(),
-  question_5: z.string().nullish(),
-  question_5_answer_a: z.string().nullish(),
-  question_5_answer_b: z.string().nullish(),
-  question_5_answer_c: z.string().nullish(),
-  question_6: z.string().nullish(),
-  question_6_answer_a: z.string().nullish(),
-  question_6_answer_b: z.string().nullish(),
-  question_6_answer_c: z.string().nullish(),
-});
-
-export type LessonQuiz = z.infer<typeof lessonQuizSchema>;
diff --git a/packages/core/src/utils/ailaModeration/helpers.ts b/packages/core/src/utils/ailaModeration/helpers.ts
index df54b56b1..f38a21d94 100644
--- a/packages/core/src/utils/ailaModeration/helpers.ts
+++ b/packages/core/src/utils/ailaModeration/helpers.ts
@@ -1,6 +1,9 @@
+import { aiLogger } from "@oakai/logger";
+
 import moderationCategories from "./moderationCategories.json";
 import type { ModerationBase, ModerationResult } from "./moderationSchema";
 
+const log = aiLogger("aila:moderation");
 export function isToxic(result: ModerationBase): boolean {
   return result.categories.some((category) =>
     typeof category === "string" ? category.startsWith("t/") : false,
@@ -46,7 +49,7 @@ export function getCategoryGroup(category: string) {
   return (
     moderationCategories.find((group) =>
       group.categories.some((c) => c.code === category),
-    ) || null
+    ) ?? null
   );
 }
 
@@ -62,9 +65,11 @@ const MOCK_SENSITIVE_RESULT: ModerationResult = {
 
 export function getMockModerationResult(message?: string) {
   if (message?.includes("mod:tox")) {
+    log.info("mod:tox detected, returning mock toxic result");
     return MOCK_TOXIC_RESULT;
   }
   if (message?.includes("mod:sen")) {
+    log.info("mod:sen detected, returning mock sensitive result");
     return MOCK_SENSITIVE_RESULT;
   }
   return null;
diff --git a/packages/core/src/utils/ailaModeration/moderationSchema.ts b/packages/core/src/utils/ailaModeration/moderationSchema.ts
index 8c1bc6612..c649a5483 100644
--- a/packages/core/src/utils/ailaModeration/moderationSchema.ts
+++ b/packages/core/src/utils/ailaModeration/moderationSchema.ts
@@ -44,19 +44,21 @@ export const moderationCategoriesSchema = z.array(
 
 const likertScale = z.number().int().min(1).max(5);
 
+const moderationScoresSchema = z.object({
+  l: likertScale.describe("Language and discrimination score"),
+  v: likertScale.describe("Violence and crime score"),
+  u: likertScale.describe("Upsetting, disturbing and sensitive score"),
+  s: likertScale.describe("Nudity and sex score"),
+  p: likertScale.describe("Physical activity and safety score"),
+  t: likertScale.describe("Toxic score"),
+});
+
 /**
  * Schema for the moderation response from the LLM.
  * Note: it's important that 'categories' is the last field in the schema
  */
 export const moderationResponseSchema = z.object({
-  scores: z.object({
-    l: likertScale.describe("Language and discrimination score"),
-    v: likertScale.describe("Violence and crime score"),
-    u: likertScale.describe("Upsetting, disturbing and sensitive score"),
-    s: likertScale.describe("Nudity and sex score"),
-    p: likertScale.describe("Physical activity and safety score"),
-    t: likertScale.describe("Toxic score"),
-  }),
+  scores: moderationScoresSchema,
   justification: z.string().describe("Add justification for your scores."),
   categories: moderationCategoriesSchema,
 });
@@ -65,8 +67,9 @@ export const moderationResponseSchema = z.object({
  * Schema for the moderation result, once parsed from the moderation response
  */
 export const moderationResultSchema = z.object({
-  categories: moderationCategoriesSchema,
   justification: z.string().optional(),
+  scores: moderationScoresSchema.optional(),
+  categories: moderationCategoriesSchema,
 });
 
 export type ModerationResult = z.infer<typeof moderationResultSchema>;
diff --git a/packages/core/src/utils/getCaptionsFromFile.ts b/packages/core/src/utils/getCaptionsFromFile.ts
index 96551c789..58f9fd137 100644
--- a/packages/core/src/utils/getCaptionsFromFile.ts
+++ b/packages/core/src/utils/getCaptionsFromFile.ts
@@ -125,7 +125,13 @@ export async function getFileFromBucket(bucketName: string, fileName: string) {
     return contents.toString();
   } catch (err) {
     log.error(
-      `Error fetching file: ${fileName} from bucket: ${bucketName}. Error: ${err}`,
+      `Error fetching file: ${fileName} from bucket: ${bucketName}. Error: ${
+        typeof err === "string"
+          ? err
+          : err instanceof Error
+            ? err.message
+            : JSON.stringify(err)
+      }`,
     );
     return;
   }
diff --git a/packages/core/src/utils/moderation.ts b/packages/core/src/utils/moderation.ts
index 3fec874e1..ae84b30c4 100644
--- a/packages/core/src/utils/moderation.ts
+++ b/packages/core/src/utils/moderation.ts
@@ -29,7 +29,7 @@ const thresholdConfig: Record<string, number> = {
 // MODERATE_ENGLISH_LANGUAGE doesn't appear in doppler
 const MODERATE_LANGUAGE = Boolean(process.env.MODERATE_ENGLISH_LANGUAGE);
 const ENGLISH_THRESHOLD =
-  parseFloat(process.env.MODERATION_THRESHOLD_ENGLISH_LANGUAGE || "") || 0.4;
+  parseFloat(process.env.MODERATION_THRESHOLD_ENGLISH_LANGUAGE ?? "") ?? 0.4;
 
 if (MODERATE_LANGUAGE && Number.isNaN(ENGLISH_THRESHOLD)) {
   throw new Error(
diff --git a/packages/core/src/utils/sendQuizFeedbackEmail.ts b/packages/core/src/utils/sendQuizFeedbackEmail.ts
index d53859af9..283427c6e 100644
--- a/packages/core/src/utils/sendQuizFeedbackEmail.ts
+++ b/packages/core/src/utils/sendQuizFeedbackEmail.ts
@@ -28,7 +28,7 @@ export const sendQuizFeedbackEmail = async (input: {
     User ${user.email} has clicked on the flag button.<br>
     <br>
     Flagged content type: ${flaggedItem.type}<br>
-    Flagged content: ${flaggedItem.value}<br>
+    Flagged content: ${typeof flaggedItem.value == "string" ? flaggedItem.value : ""}<br>
     Generation ID: ${flaggedItem.lastGenerationId}<br>
     Feedback: ${feedback.typedFeedback}<br>
     Inappropriate content: ${feedback.contentIsInappropriate}<br>
diff --git a/packages/core/src/utils/slack.ts b/packages/core/src/utils/slack.ts
index c489e0fbf..1fc6b088c 100644
--- a/packages/core/src/utils/slack.ts
+++ b/packages/core/src/utils/slack.ts
@@ -1,4 +1,4 @@
-import type { ActionsBlock, SectionBlock} from "@slack/web-api";
+import type { ActionsBlock, SectionBlock } from "@slack/web-api";
 import { WebClient } from "@slack/web-api";
 import {
   uniqueNamesGenerator,
@@ -9,12 +9,18 @@ import {
 
 import { getExternalFacingUrl } from "../functions/slack/getExternalFacingUrl";
 
-if (!process.env.SLACK_NOTIFICATION_CHANNEL_ID) {
+if (
+  !process.env.SLACK_NOTIFICATION_CHANNEL_ID ||
+  !process.env.SLACK_AI_OPS_NOTIFICATION_CHANNEL_ID
+) {
   throw new Error("Missing env var SLACK_NOTIFICATION_CHANNEL_ID");
 }
 export const slackNotificationChannelId =
   process.env.SLACK_NOTIFICATION_CHANNEL_ID;
 
+export const slackAiOpsNotificationChannelId =
+  process.env.SLACK_AI_OPS_NOTIFICATION_CHANNEL_ID;
+
 export const slackWebClient = new WebClient(
   process.env.SLACK_BOT_USER_OAUTH_TOKEN,
 );
diff --git a/packages/db/.eslintrc.cjs b/packages/db/.eslintrc.cjs
deleted file mode 100644
index 9526c3c79..000000000
--- a/packages/db/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["eslint-config-custom"],
-  parserOptions: {
-    project: __dirname + "/tsconfig.json",
-  },
-};
diff --git a/packages/db/client/index.ts b/packages/db/client/index.ts
index 636ff043f..07fde8e93 100644
--- a/packages/db/client/index.ts
+++ b/packages/db/client/index.ts
@@ -31,7 +31,7 @@ export type PrismaClientWithAccelerate = typeof extendedPrisma;
 
 declare global {
   // allow global `var` declarations
-  // eslint-disable-next-line no-var
+
   var prisma: PrismaClientWithAccelerate | undefined;
 }
 
diff --git a/packages/db/package.json b/packages/db/package.json
index 6ff431295..e1c043099 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -1,9 +1,16 @@
 {
   "name": "@oakai/db",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "license": "MIT",
   "main": "./index.ts",
   "types": "./index.ts",
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "rules": {}
+  },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
     "db-dump:prd": "docker exec oak-ai-beta pg_dump $(doppler secrets get -c prd --plain DATABASE_ADMIN_URL | sed -e 's/?sslmode=required//g') --no-owner --exclude-table-data public.generations --exclude-table-data public.snippets --exclude-table-data public.downloads",
@@ -50,17 +57,21 @@
     "docker-psql": " docker exec -it oak-ai-beta psql -U oai",
     "docker-reset": "pnpm run docker-clear && pnpm run docker-run",
     "docker-run": "docker run --name oak-ai-beta -p 8432:5432 -d oai-pg",
+    "lint": "eslint .",
+    "lint:debug": "eslint --debug .",
     "schema-format": "pnpm with-env prisma format",
     "script-add-metadata-to-lesson-summaries": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./scripts/processing/add_metadata_to_lesson_summaries.ts",
     "script-batch-process-clean-questions": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./scripts/processing/batch_process_clean_questions.ts",
     "script-batch-update-clerk-users": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./scripts/processing/update_clerk_users.ts",
     "validate-data": "ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./scripts/import-export/validate_data.ts",
+    "type-check": "tsc --noEmit",
     "with-env": "dotenv -e ../../.env --"
   },
   "prettier": "@oakai/prettier-config",
   "dependencies": {
     "@oakai/logger": "*",
-    "@prisma/client": "5.16.1",
+    "@prisma/client": "^5.16.1",
+    "@prisma/extension-accelerate": "^1.2.1",
     "@types/chunk-text": "^1.0.0",
     "cheerio": "1.0.0-rc.12",
     "chunk-text": "^2.0.1",
@@ -73,10 +84,11 @@
     "yaml": "^2.4.1"
   },
   "devDependencies": {
+    "@oakai/eslint-config": "*",
     "@oakai/prettier-config": "*",
     "dotenv-cli": "^6.0.0",
     "prisma": "5.16.1",
-    "typescript": "5.3.3",
+    "typescript": "5.7.2",
     "zod-prisma": "^0.5.4"
   },
   "engines": {
@@ -85,5 +97,6 @@
   },
   "prisma": {
     "seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
-  }
+  },
+  "type": "module"
 }
diff --git a/packages/db/prisma/migrations/20241126121910_ingest_rag_published_index/migration.sql b/packages/db/prisma/migrations/20241126121910_ingest_rag_published_index/migration.sql
new file mode 100644
index 000000000..ae31031a9
--- /dev/null
+++ b/packages/db/prisma/migrations/20241126121910_ingest_rag_published_index/migration.sql
@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - Added the required column `oak_lesson_slug` to the `rag_lesson_plans` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "ingest"."ingest" ALTER COLUMN "config" DROP DEFAULT;
+
+-- AlterTable
+ALTER TABLE "rag"."rag_lesson_plans" ADD COLUMN     "is_published" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "oak_lesson_slug" TEXT NOT NULL,
+ALTER COLUMN "oak_lesson_id" DROP NOT NULL;
+
+-- CreateIndex
+CREATE INDEX "idx_rag_lesson_plans_published_key_stage_subject" ON "rag"."rag_lesson_plans"("is_published", "key_stage_slug", "subject_slug");
diff --git a/packages/db/prisma/migrations/20241126134932_add_deleted_session_col/migration.sql b/packages/db/prisma/migrations/20241126134932_add_deleted_session_col/migration.sql
new file mode 100644
index 000000000..b9e9d9f95
--- /dev/null
+++ b/packages/db/prisma/migrations/20241126134932_add_deleted_session_col/migration.sql
@@ -0,0 +1,3 @@
+
+-- AlterTable
+ALTER TABLE "public"."app_sessions" ADD COLUMN     "deleted_at" TIMESTAMP(3);
diff --git a/packages/db/prisma/migrations/20241202151820_moderation_scores/migration.sql b/packages/db/prisma/migrations/20241202151820_moderation_scores/migration.sql
new file mode 100644
index 000000000..e84b992a3
--- /dev/null
+++ b/packages/db/prisma/migrations/20241202151820_moderation_scores/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."moderations" ADD COLUMN     "scores" JSONB;
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index aa9b59a59..a6f727de3 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -344,14 +344,15 @@ model AppSession {
   id        String   @id @default(cuid())
   createdAt DateTime @default(now()) @map("created_at")
   updatedAt DateTime @updatedAt @map("updated_at")
-
+  deletedAt DateTime? @map("deleted_at")
+  
   app   App    @relation(fields: [appId], references: [id], onDelete: Cascade)
   appId String @map("app_id")
 
   userId String @map("user_id") // The user that requested this generation
 
   output Json? // The final output of the session
-
+  
   userTweaks          UserTweak[]
   reGenerations       ReGeneration[]
   generationUserFlags GenerationUserFlag[]
@@ -789,6 +790,7 @@ model Moderation {
   appSessionId     String    @map("app_session_id")
   messageId        String    @map("message_id")
   categories       Json[]
+  scores           Json?     @map("scores") @db.JsonB
   justification    String?
   lessonSnapshotId String?   @map("lesson_snapshot_id")
   // A user's comment in relation to the moderation. Likely they are contesting it.
diff --git a/packages/db/schemas/lesson-with-snippets.ts b/packages/db/schemas/lesson-with-snippets.ts
index ac9da95fe..9a557f435 100644
--- a/packages/db/schemas/lesson-with-snippets.ts
+++ b/packages/db/schemas/lesson-with-snippets.ts
@@ -18,5 +18,3 @@ export const LessonWithSnippets = z.object({
     }),
   ),
 });
-
-export type LessonWithSnippets = z.infer<typeof LessonWithSnippets>;
diff --git a/packages/db/schemas/lesson.ts b/packages/db/schemas/lesson.ts
index 32d5e3843..e8d42fe98 100644
--- a/packages/db/schemas/lesson.ts
+++ b/packages/db/schemas/lesson.ts
@@ -38,26 +38,7 @@ export const ZLesson = z.object({
     programmeOfStudyUnits: z.array(
       z.object({
         id: z.number(),
-        programme: z.object({
-          id: z.number(),
-          slug: z.string(),
-          title: z.string(),
-          subject: z.object({
-            id: z.number(),
-            slug: z.string(),
-            title: z.string(),
-          }),
-          year: z.object({
-            id: z.number(),
-            title: z.string(),
-            slug: z.string(),
-            keyStage: z.object({
-              id: z.number(),
-              title: z.string(),
-              slug: z.string(),
-            }),
-          }),
-        }),
+        programme: Programme,
       }),
     ),
     therapyUnits: z.array(z.unknown()).nullish(),
diff --git a/packages/db/scripts/import-export/validate_data.ts b/packages/db/scripts/import-export/validate_data.ts
index e9696b11b..59e609910 100644
--- a/packages/db/scripts/import-export/validate_data.ts
+++ b/packages/db/scripts/import-export/validate_data.ts
@@ -3,6 +3,7 @@
  * This script validates the data in the CSV files against the constraints defined in the Prisma schema.
  *
  **/
+import { aiLogger } from "@oakai/logger";
 import { Prisma } from "@prisma/client";
 import csvParser from "csv-parser";
 import dotenv from "dotenv";
@@ -11,18 +12,21 @@ import * as path from "path";
 
 import { prisma } from "../..";
 
+const logger = aiLogger("db");
+
 const dataDir = path.join(__dirname, "data");
 
 dotenv.config();
 
 // Helper function to log messages
 const log = (message: string) => {
-  console.log(`[LOG] ${new Date().toISOString()}: ${message}`);
+  logger.info(`[LOG] ${new Date().toISOString()}: ${message}`);
 };
 
 // Helper function to get the Prisma model metadata
-async function getModelConstraints() {
+function getModelConstraints() {
   log("Inferring model constraints from Prisma schema...");
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const modelConstraints: Record<string, any> = {};
 
   const models = Prisma.dmmf.datamodel.models;
@@ -30,13 +34,15 @@ async function getModelConstraints() {
   models.forEach((model) => {
     if (model.dbName) {
       const tablesFilePath = path.join(__dirname, "tables.txt");
-      const tables = fs.readFileSync(tablesFilePath, "utf-8").split("\n").map(t => t.trim());
+      const tables = fs
+        .readFileSync(tablesFilePath, "utf-8")
+        .split("\n")
+        .map((t) => t.trim());
 
       if (!tables.includes(model.dbName)) {
         return;
       }
 
-      console.log(`Processing model: ${model.dbName}`);
       log(`Processing model: ${model.dbName}`);
 
       const nonNullable = model.fields
@@ -44,7 +50,7 @@ async function getModelConstraints() {
           (field) =>
             field.isRequired && !field.relationName && !field.hasDefaultValue,
         )
-        .map((field) => field.dbName || field.name); // Use `field.name` as fallback if `field.dbName` is undefined
+        .map((field) => field.dbName ?? field.name); // Use `field.name` as fallback if `field.dbName` is undefined
 
       const foreignKeys = model.fields
         .filter((field) => field.relationName)
@@ -82,14 +88,17 @@ const validateCSV = (
 ) => {
   return new Promise<void>((resolve, reject) => {
     const errors: string[] = [];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const foreignKeyCheck: Record<string, Set<any>> = {};
 
     log(`Validating CSV file: ${filePath}`);
     fs.createReadStream(filePath)
       .pipe(csvParser())
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       .on("data", (row: any) => {
         // Check non-nullable fields
         nonNullable.forEach((col) => {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
           if (!row[col]) {
             errors.push(
               `NULL value found in non-nullable column '${col}' in row ${JSON.stringify(
@@ -99,11 +108,13 @@ const validateCSV = (
           }
         });
 
-        for (const [fk, refTable] of Object.entries(foreignKeys)) {
+        for (const fk of Object.keys(foreignKeys)) {
           if (!foreignKeyCheck[fk]) {
             foreignKeyCheck[fk] = new Set();
           }
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
           if (row[fk]) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             foreignKeyCheck[fk]!.add(row[fk]);
           }
         }
@@ -111,9 +122,9 @@ const validateCSV = (
       .on("end", async () => {
         log(`Completed reading CSV file: ${filePath}`);
 
-        // Validate foriegn keys in CSV
+        // Validate foreign keys in CSV
         for (const [fk, refTable] of Object.entries(foreignKeys)) {
-          const ids: string[] = Array.from(foreignKeyCheck[fk] || []);
+          const ids: string[] = Array.from(foreignKeyCheck[fk] ?? []);
 
           function handleTable(table: string) {
             if (table === "key_stage") {
@@ -134,6 +145,7 @@ const validateCSV = (
               const refIds = new Set<string>();
               fs.createReadStream(refFilePath)
                 .pipe(csvParser())
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 .on("data", (row: any) => {
                   refIds.add(row.id);
                 })
@@ -152,26 +164,30 @@ const validateCSV = (
 
         if (errors.length > 0) {
           log(`Validation failed for CSV file: ${filePath}`);
-          reject(errors);
+          reject(new Error(errors.join("\n")));
         } else {
           log(`Validation passed for CSV file: ${filePath}`);
           resolve();
         }
       })
       .on("error", (error) => {
-        reject(`Error reading CSV file: ${filePath}. Error: ${error.message}`);
+        reject(
+          new Error(
+            `Error reading CSV file: ${filePath}. Error: ${error.message}`,
+          ),
+        );
       });
   });
 };
 
 const main = async () => {
   try {
-    const modelConstraints = await getModelConstraints();
+    const modelConstraints = getModelConstraints();
 
     for (const [table, constraints] of Object.entries(modelConstraints)) {
       const filePath = path.join(dataDir, `${table}.csv`);
       if (!fs.existsSync(filePath)) {
-        console.error(`CSV file for table '${table}' does not exist.`);
+        logger.error(`CSV file for table '${table}' does not exist.`);
         process.exit(1);
       }
 
@@ -183,17 +199,17 @@ const main = async () => {
         );
         log(`Validation passed for table '${table}'`);
       } catch (errors) {
-        console.error(`Validation failed for table '${table}':\n`, errors);
+        logger.error(`Validation failed for table '${table}':\n`, errors);
         process.exit(1);
       }
     }
 
     log("All tables validated successfully.");
   } catch (e) {
-    console.error(e);
+    logger.error(e);
     process.exit(1);
   } finally {
-    console.log("Done");
+    logger.info("Done");
     await prisma.$disconnect();
   }
 };
@@ -203,7 +219,7 @@ main()
     await prisma.$disconnect();
   })
   .catch(async (e) => {
-    console.error(e);
+    logger.error(e);
     await prisma.$disconnect();
     process.exit(1);
   });
diff --git a/packages/db/scripts/processing/batch_process_clean_questions.ts b/packages/db/scripts/processing/batch_process_clean_questions.ts
index 3f310790e..03026e9f2 100644
--- a/packages/db/scripts/processing/batch_process_clean_questions.ts
+++ b/packages/db/scripts/processing/batch_process_clean_questions.ts
@@ -1,6 +1,11 @@
+import { aiLogger } from "@oakai/logger";
+
 import { prisma } from "../../";
 
-async function getQuestionsAndWriteBatch(skip: number) {
+const logger = aiLogger("db");
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+async function getQuestionsAndWriteBatch(_skip: number) {
   const questions = await prisma.quizQuestion.findMany({
     include: {
       answers: {
@@ -32,7 +37,7 @@ async function getQuestionsAndWriteBatch(skip: number) {
       },
     },
   });
-  console.log("questions", questions);
+  logger.info("questions", questions);
   await prisma.questionsForJudgement.createMany({
     data: questions
       .filter(
@@ -42,7 +47,7 @@ async function getQuestionsAndWriteBatch(skip: number) {
             question.answers[0]?.lesson.subject?.id &&
             question.answers[0]?.lesson.subject?.id !== undefined &&
             question.answers[0]?.lesson.subject?.id !== null &&
-            question.question.endsWith("?")) ||
+            question.question.endsWith("?")) ??
           (question.question &&
             question.question.split(" ").length > 2 &&
             question.answers[0]?.lesson.subject?.id &&
@@ -68,14 +73,14 @@ async function removeQuestionsContainingWords(string: string) {
   const questionsToRemove = questions.filter((question) =>
     question?.quizQuestion?.question?.includes(string),
   );
-  prisma.questionsForJudgement.deleteMany({
+  await prisma.questionsForJudgement.deleteMany({
     where: {
       id: {
         in: questionsToRemove.map((question) => question.id),
       },
     },
   });
-  console.log("Removed number of questions", questionsToRemove.length);
+  logger.info("Removed number of questions", questionsToRemove.length);
 }
 
 const main = async () => {
@@ -88,10 +93,10 @@ const main = async () => {
     await getQuestionsAndWriteBatch(0);
     await removeQuestionsContainingWords("**not**");
   } catch (e) {
-    console.error(e);
+    logger.error(e);
     process.exit(1);
   } finally {
-    console.log("Done");
+    logger.info("Done");
     await prisma.$disconnect();
   }
 };
@@ -101,7 +106,7 @@ main()
     await prisma.$disconnect();
   })
   .catch(async (e) => {
-    console.error(e);
+    logger.error(e);
     await prisma.$disconnect();
     process.exit(1);
   });
diff --git a/packages/db/scripts/processing/update_clerk_users.ts b/packages/db/scripts/processing/update_clerk_users.ts
index 2e3517caf..4b5099422 100644
--- a/packages/db/scripts/processing/update_clerk_users.ts
+++ b/packages/db/scripts/processing/update_clerk_users.ts
@@ -1,5 +1,23 @@
+import { aiLogger } from "@oakai/logger";
+import { z } from "zod";
+
 import { prisma } from "../../";
 
+const logger = aiLogger("db");
+
+const ClerkUserSchema = z.object({
+  id: z.string(),
+  created_at: z.string(),
+  updated_at: z.string(),
+  email_addresses: z.array(
+    z.object({
+      id: z.string(),
+      email_address: z.string().email(),
+    }),
+  ),
+  primary_email_address_id: z.string(),
+});
+
 /**
  * This script deletes all records from the `users` table, then re-imports them all
  * from clerk
@@ -20,9 +38,12 @@ async function getUsersBatch({
       },
     },
   );
-  const data = await res.json();
 
-  return data.map((user: any) => {
+  const ClerkResponseSchema = z.array(ClerkUserSchema);
+
+  const validatedData = ClerkResponseSchema.parse(await res.json());
+
+  return validatedData.map((user) => {
     const email: string = user.email_addresses.find(
       (email: { id: string }) => email.id === user.primary_email_address_id,
     )!.email_address;
@@ -46,11 +67,8 @@ async function updateAllUsers() {
   let offset = 0;
   let resultsCount = 0;
 
-  let i = 0;
-
+  // eslint-disable-next-line no-constant-condition
   while (true) {
-    i++;
-
     const data = await getUsersBatch({
       limit,
       offset,
@@ -60,7 +78,7 @@ async function updateAllUsers() {
       break;
     }
 
-    console.log(`Processing batch of ${data.length} users`);
+    logger.info(`Processing batch of ${data.length} users`);
 
     await prisma.user.createMany({
       data,
@@ -70,7 +88,7 @@ async function updateAllUsers() {
     offset += limit;
   }
 
-  console.log(`Created/updated ${resultsCount} user records`);
+  logger.info(`Created/updated ${resultsCount} user records`);
 }
 
 const main = async () => {
@@ -78,10 +96,10 @@ const main = async () => {
     await prisma.user.deleteMany();
     await updateAllUsers();
   } catch (e) {
-    console.error(e);
+    logger.error(e);
     process.exit(1);
   } finally {
-    console.log("Done");
+    logger.info("Done");
     await prisma.$disconnect();
   }
 };
@@ -91,7 +109,7 @@ main()
     await prisma.$disconnect();
   })
   .catch(async (e) => {
-    console.error(e);
+    logger.error(e);
     await prisma.$disconnect();
     process.exit(1);
   });
diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json
index c4b45432a..3aff61830 100644
--- a/packages/db/tsconfig.json
+++ b/packages/db/tsconfig.json
@@ -1,4 +1,13 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["index.ts", "prisma/**/*.ts", "client/index.ts"]
+  "include": [
+    "index.ts",
+    "prisma/**/*.ts",
+    "client/index.ts",
+    "scripts/**/*.ts",
+    "schemas/**/*.ts"
+  ],
+  "compilerOptions": {
+    "baseUrl": "."
+  }
 }
diff --git a/packages/eslint-config-custom/index.js b/packages/eslint-config-custom/index.js
deleted file mode 100644
index 76d707d25..000000000
--- a/packages/eslint-config-custom/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-module.exports = {
-  extends: ["eslint:recommended", "prettier"],
-  plugins: ["turbo", "@typescript-eslint",],
-  ignorePatterns: ["node_modules", "dist", "../../node_modules", "../../dist"],
-  root: true,
-  env: {
-    es6: true,
-    node: true,
-  },
-  parserOptions: {
-    sourceType: "module",
-    warnOnUnsupportedTypeScriptVersion: false,
-  },
-  overrides: [
-    {
-      extends: [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/recommended-requiring-type-checking",
-      ],
-      parser: "@typescript-eslint/parser",
-      files: ["*.{ts,tsx}"],
-      rules: {
-        "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",
-          {
-            allowExpressions: true,
-            allowTypedFunctionExpressions: true,
-          },
-        ],
-      },
-    },
-    {
-      extends: ["plugin:jest/recommended"],
-      plugins: ["jest"],
-      files: ["**/__tests__/**"],
-      env: {
-        "jest/globals": true,
-      },
-      rules: {
-        "@typescript-eslint/unbound-method": "off",
-      },
-    },
-  ],
-};
diff --git a/packages/eslint-config-custom/nextjs.js b/packages/eslint-config-custom/nextjs.js
deleted file mode 100644
index 322de8d94..000000000
--- a/packages/eslint-config-custom/nextjs.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  extends: ["custom/react-library", "eslint-config-next"],
-};
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
deleted file mode 100644
index b4ca03cb0..000000000
--- a/packages/eslint-config-custom/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "eslint-config-custom",
-  "version": "0.0.0",
-  "description": "Custom ESLint configuration for React, Next.js, and TypeScript",
-  "license": "MIT",
-  "main": "index.js",
-  "files": [
-    "index.js",
-    "react-library.js",
-    "nextjs.js"
-  ],
-  "dependencies": {
-    "@rushstack/eslint-patch": "^1.6.1",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
-    "@typescript-eslint/typescript-estree": "^7.18.0",
-    "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"
-  },
-  "peerDependencies": {
-    "eslint": "^8.36.0",
-    "prettier": "^3.1.1"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
diff --git a/packages/eslint-config-custom/patch/modern-module-resolution.js b/packages/eslint-config-custom/patch/modern-module-resolution.js
deleted file mode 100644
index ff9ddd876..000000000
--- a/packages/eslint-config-custom/patch/modern-module-resolution.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// See https://www.npmjs.com/package/@rushstack/eslint-patch
-// @ts-ignore
-require("@rushstack/eslint-patch/modern-module-resolution");
diff --git a/packages/eslint-config-custom/react-library.js b/packages/eslint-config-custom/react-library.js
deleted file mode 100644
index 951387ea5..000000000
--- a/packages/eslint-config-custom/react-library.js
+++ /dev/null
@@ -1,23 +0,0 @@
-module.exports = {
-  extends: [
-    "custom",
-    "plugin:react-hooks/recommended",
-    "plugin:react/recommended",
-  ],
-  settings: {
-    react: {
-      version: "detect",
-    },
-  },
-  env: {
-    browser: true,
-  },
-  parserOptions: {
-    babelOptions: {
-      presets: [require.resolve("next/babel")],
-    },
-  },
-  rules: {
-    "react/react-in-jsx-scope": "off",
-  },
-};
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
new file mode 100644
index 000000000..84655b5ce
--- /dev/null
+++ b/packages/eslint-config/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "@oakai/eslint-config",
+  "version": "1.0.0",
+  "description": "Custom ESLint configuration for React, Next.js, and TypeScript",
+  "license": "MIT",
+  "main": "src/index.mjs",
+  "files": [
+    "src/*"
+  ],
+  "devDependencies": {
+    "@eslint/js": "^9.16.0",
+    "@next/eslint-plugin-next": "^15.0.3",
+    "@rushstack/eslint-patch": "^1.10.4",
+    "@types/eslint-config-prettier": "^6.11.3",
+    "@types/node": "^20.9.0",
+    "@typescript-eslint/eslint-plugin": "^8.17.0",
+    "@typescript-eslint/parser": "^8.17.0",
+    "@typescript-eslint/typescript-estree": "^8.12.2",
+    "eslint": "^9.16.0",
+    "eslint-config-next": "15.0.3",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^28.9.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-storybook": "^0.11.1",
+    "eslint-plugin-turbo": "^2.3.3",
+    "globals": "^15.13.0",
+    "prettier": "^3.4.1",
+    "ts-node": "^10.9.2",
+    "typescript": "5.7.2"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "scripts": {
+    "build": "tsc",
+    "type-check": "tsc --noEmit"
+  }
+}
diff --git a/packages/eslint-config/src/ignores.mjs b/packages/eslint-config/src/ignores.mjs
new file mode 100644
index 000000000..f037b3ef5
--- /dev/null
+++ b/packages/eslint-config/src/ignores.mjs
@@ -0,0 +1,3 @@
+export const ignores = {
+  ignores: ["**/node_modules/**", "**/build/**", "**/dist/**", '**/.next/**',"**/.storybook/**","**/.turbo/**", "**/coverage/**", "**/playwright-report/**", "**/jest.config.mjs"],
+}
\ No newline at end of file
diff --git a/packages/eslint-config/src/index.mjs b/packages/eslint-config/src/index.mjs
new file mode 100644
index 000000000..e8be4fadd
--- /dev/null
+++ b/packages/eslint-config/src/index.mjs
@@ -0,0 +1,142 @@
+import eslint from '@eslint/js';
+import tsEslint from '@typescript-eslint/eslint-plugin';
+import tsParser from '@typescript-eslint/parser';
+import importPlugin from 'eslint-plugin-import';
+import jestPlugin from 'eslint-plugin-jest';
+import nextPlugin from '@next/eslint-plugin-next';
+import storybookPlugin from 'eslint-plugin-storybook';
+import reactHooksPlugin from "eslint-plugin-react-hooks";
+import reactPlugin from "eslint-plugin-react";
+import turboPlugin from 'eslint-plugin-turbo';
+import prettierConfig from 'eslint-config-prettier';
+import globals from 'globals';
+import { ignores } from "./ignores.mjs";
+import { rules } from "./rules.mjs";
+
+/** @type {import('@typescript-eslint/utils/ts-eslint').FlatConfig.ConfigArray} */
+const config = [
+  ignores,
+  eslint.configs.recommended,
+  prettierConfig,
+  {
+    files: ['**/*.cjs'],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: "latest",
+      },
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+        ...globals.browser,
+        "console": "readonly",
+      },
+    },
+  },
+  {
+    files: ['**/*.{js,mjs}'],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        sourceType: 'module',
+        ecmaVersion: "latest",
+      },
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+        ...globals.browser,
+        "console": "readonly",
+      },
+    },
+
+    plugins: {
+      '@typescript-eslint': tsEslint,
+      'import': importPlugin,
+    },
+    
+    rules: {
+      '@typescript-eslint/no-require-imports': 'off',
+      'import/no-commonjs': 'off',
+      '@typescript-eslint/ban-ts-comment': 'off',
+    },
+  },
+  {
+    files: ["**/apps/nextjs/**/*.{ts,tsx}"],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+        project: ["./tsconfig.json"],
+        warnOnUnsupportedTypeScriptVersion: false,
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.jest,
+        "NodeJS": "readonly",
+        "React": "readonly",
+      },
+    },
+
+    plugins: {
+      '@typescript-eslint': tsEslint,
+      'import': importPlugin,
+      'jest': jestPlugin,
+      'turbo': turboPlugin,
+      "next": nextPlugin,
+      "storybook": storybookPlugin,
+      "react-hooks": reactHooksPlugin,
+      "react": reactPlugin,
+    },
+
+    rules: {
+      ...rules,
+      "react/jsx-no-comment-textnodes": "warn",
+      "react-hooks/exhaustive-deps": "error",
+      "react-hooks/rules-of-hooks": "error",
+    },
+    settings: {
+      "import/resolver": {
+        typescript: true,
+        node: true,
+      },
+    },
+  },
+  {
+    files: ["**/*.{ts,tsx}"],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+        project: ["./tsconfig.json"],
+        warnOnUnsupportedTypeScriptVersion: false,
+      },
+      globals: {
+        ...globals.node,
+        ...globals.browser,
+        ...globals.jest,
+        "NodeJS": "readonly",
+      },
+    },
+
+    plugins: {
+      '@typescript-eslint': tsEslint,
+      'import': importPlugin,
+      'jest': jestPlugin,
+      'turbo': turboPlugin,
+    },
+
+    rules,
+    settings: {
+      "import/resolver": {
+        typescript: true,
+        node: true,
+      },
+    },
+  },
+];
+
+export default config;
\ No newline at end of file
diff --git a/packages/eslint-config/src/plugins.d.ts b/packages/eslint-config/src/plugins.d.ts
new file mode 100644
index 000000000..70bdb201e
--- /dev/null
+++ b/packages/eslint-config/src/plugins.d.ts
@@ -0,0 +1,3 @@
+declare module 'eslint-plugin-import';
+declare module '@next/eslint-plugin-next';
+declare module 'eslint-plugin-react-hooks';
\ No newline at end of file
diff --git a/packages/eslint-config/src/rules.mjs b/packages/eslint-config/src/rules.mjs
new file mode 100644
index 000000000..1aead4601
--- /dev/null
+++ b/packages/eslint-config/src/rules.mjs
@@ -0,0 +1,74 @@
+import tsEslint from '@typescript-eslint/eslint-plugin';
+
+const typescript = tsEslint.configs.recommended;
+
+// These are rules that are currently set to "warn"
+// But should be set to "error" once we fix all the existing issues
+const rulesToMoveToError = {
+  "@typescript-eslint/no-unsafe-return": "warn",
+  "@typescript-eslint/no-misused-promises": "warn",
+  "@typescript-eslint/no-unsafe-argument": "warn",
+  "@typescript-eslint/no-floating-promises": "warn",
+  "@typescript-eslint/no-unsafe-member-access": "warn",
+  "@typescript-eslint/no-redundant-type-constituents": "warn",       
+}
+
+const rulesToDecideOn = {
+  "@typescript-eslint/no-unsafe-assignment": "off", // this rule is buggy and is causing a lot of false positives
+  "@typescript-eslint/no-unsafe-call": "off", // this rule is buggy and is causing a lot of false positives
+}
+
+// @ts-check
+/** @type {Partial<Record<string, import('@typescript-eslint/utils/ts-eslint').SharedConfig.RuleEntry>>} */
+export const rules = {
+  ...typescript.rules,
+  ...rulesToMoveToError,
+  ...rulesToDecideOn,
+  "@typescript-eslint/prefer-nullish-coalescing": "warn",
+  "@typescript-eslint/no-unsafe-enum-comparison": "error",
+  "@typescript-eslint/no-unnecessary-type-assertion": "warn",
+  "@typescript-eslint/consistent-type-imports": "warn",
+  "@typescript-eslint/comma-dangle": "off",
+  "@typescript-eslint/no-duplicate-enum-values": "off",
+  "@typescript-eslint/no-unused-vars": "warn",
+  "@typescript-eslint/no-unused-expressions": ["warn", {
+    allowShortCircuit: true,
+    allowTernary: true,
+    allowTaggedTemplates: true,
+  }],
+  "@typescript-eslint/require-await": "warn",  
+  "@typescript-eslint/unbound-method": "off",
+  "@typescript-eslint/restrict-template-expressions": "error",
+  "@typescript-eslint/await-thenable": "error",
+  "@typescript-eslint/explicit-function-return-type": ["off", {
+    allowExpressions: true,
+    allowTypedFunctionExpressions: true,
+  }],
+
+  // Import plugin rules
+  "import/no-cycle": ["warn", { maxDepth: Infinity }],
+  "import/newline-after-import": "off",
+  "import/no-duplicates": "off",
+
+  // General ESLint rules
+  "no-console": "warn",
+  "no-extra-boolean-cast": "error",
+  "no-useless-escape": "error",
+  "no-unsafe-finally": "error",
+  "no-constant-condition": "warn",
+  "no-prototype-builtins": "error",
+  "no-inner-declarations": "warn",
+  "no-restricted-imports": [
+    "error",
+    {
+      paths: [
+        {
+          name: "posthog-js/react",
+          importNames: ["usePostHog"],
+          message:
+            "usePostHog doesn't support multiple PostHog instances, use useAnalytics instead",
+        },
+      ],
+    },
+  ],
+}
\ No newline at end of file
diff --git a/packages/eslint-config/tsconfig.json b/packages/eslint-config/tsconfig.json
new file mode 100644
index 000000000..9cb69fa06
--- /dev/null
+++ b/packages/eslint-config/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "rootDir": "./src",
+    "outDir": "./dist",
+    "declaration": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "baseUrl": "./src"
+  },
+  "include": [
+    "*.ts",
+    "src/*.ts",
+    "eslint.config.old",
+    "src/rules.mjs",
+    "src/index.mjs",
+    "src/ignores.mjs"
+  ],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/packages/exports/.eslintrc.cjs b/packages/exports/.eslintrc.cjs
deleted file mode 100644
index 9526c3c79..000000000
--- a/packages/exports/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["eslint-config-custom"],
-  parserOptions: {
-    project: __dirname + "/tsconfig.json",
-  },
-};
diff --git a/packages/exports/package.json b/packages/exports/package.json
index 785b6f5ba..d2c56a44d 100644
--- a/packages/exports/package.json
+++ b/packages/exports/package.json
@@ -1,13 +1,21 @@
 {
   "name": "@oakai/exports",
-  "version": "0.0.1",
+  "version": "1.0.0",
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "rules": {}
+  },
   "scripts": {
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "eslint .",
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
     "@oakai/logger": "*",
-    "typescript": "5.3.3"
+    "typescript": "5.7.2"
   },
-  "prettier": "@oakai/prettier-config"
+  "prettier": "@oakai/prettier-config",
+  "type": "module"
 }
diff --git a/packages/exports/src/exportAdditionalMaterials.ts b/packages/exports/src/exportAdditionalMaterials.ts
index 4f8d3fe32..5ce40ea36 100644
--- a/packages/exports/src/exportAdditionalMaterials.ts
+++ b/packages/exports/src/exportAdditionalMaterials.ts
@@ -4,7 +4,7 @@ import { prepLessonForAdditionalMaterialsDoc } from "./dataHelpers/prepLessonFor
 import { exportGeneric } from "./exportGeneric";
 import { getDocsClient } from "./gSuite/docs/client";
 import { populateDoc } from "./gSuite/docs/populateDoc";
-import type { LessonSlidesInputData } from "./schema/input.schema";
+import type { LessonInputData } from "./schema/input.schema";
 import { getSlidesTemplateIdAdditionalMaterials as getDocsTemplateIdAdditionalMaterials } from "./templates";
 import type { OutputData, Result, State } from "./types";
 
@@ -17,7 +17,7 @@ export const exportAdditionalMaterials = async ({
   onStateChange,
 }: {
   snapshotId: string;
-  lesson: LessonSlidesInputData;
+  lesson: LessonInputData;
   userEmail: string;
   onStateChange: (state: State<OutputData>) => void;
 }): Promise<Result<OutputData>> => {
diff --git a/packages/exports/src/gSuite/docs/findMarkdownImages.ts b/packages/exports/src/gSuite/docs/findMarkdownImages.ts
new file mode 100644
index 000000000..34b09977c
--- /dev/null
+++ b/packages/exports/src/gSuite/docs/findMarkdownImages.ts
@@ -0,0 +1,70 @@
+import type { docs_v1 } from "@googleapis/docs";
+
+export async function findMarkdownImages(
+  googleDocs: docs_v1.Docs,
+  documentId: string,
+): Promise<{ url: string; altText: string; startIndex: number }[]> {
+  const doc = await googleDocs.documents.get({ documentId });
+  const body = doc.data.body?.content;
+
+  if (!body) return [];
+
+  const markdownImageRegex = /!\[(.*?)\]\((.*?)\)/g;
+  const matches: { url: string; altText: string; startIndex: number }[] = [];
+
+  function handleMatch(
+    match: RegExpExecArray,
+    textElement: docs_v1.Schema$ParagraphElement,
+  ): void {
+    const [, altText, url] = match;
+    const textElementStartIndex = textElement.startIndex;
+    const matchIndex = match.index;
+    if (
+      typeof textElementStartIndex !== "number" ||
+      typeof matchIndex !== "number"
+    ) {
+      return;
+    }
+    const startIndex = textElementStartIndex + matchIndex;
+    if (url && typeof altText === "string") {
+      matches.push({ url, altText, startIndex });
+    }
+  }
+
+  function processTextElements(elements: docs_v1.Schema$ParagraphElement[]) {
+    for (const textElement of elements) {
+      const textContent = textElement.textRun?.content ?? "";
+      let match: RegExpExecArray | null;
+      while ((match = markdownImageRegex.exec(textContent)) !== null) {
+        handleMatch(match, textElement);
+      }
+    }
+  }
+
+  function processTableCells(cells: docs_v1.Schema$TableCell[]) {
+    for (const cell of cells) {
+      for (const cellElement of cell.content ?? []) {
+        if (cellElement.paragraph?.elements) {
+          processTextElements(cellElement.paragraph.elements);
+        }
+      }
+    }
+  }
+
+  function processBodyElements(elements: docs_v1.Schema$StructuralElement[]) {
+    for (const element of elements) {
+      if (element.table) {
+        for (const row of element.table.tableRows ?? []) {
+          processTableCells(row.tableCells ?? []);
+        }
+      }
+      if (element.paragraph?.elements) {
+        processTextElements(element.paragraph.elements);
+      }
+    }
+  }
+
+  processBodyElements(body);
+
+  return matches;
+}
diff --git a/packages/exports/src/gSuite/docs/imageReplacements.ts b/packages/exports/src/gSuite/docs/imageReplacements.ts
new file mode 100644
index 000000000..49cdae924
--- /dev/null
+++ b/packages/exports/src/gSuite/docs/imageReplacements.ts
@@ -0,0 +1,62 @@
+import type { docs_v1 } from "@googleapis/docs";
+import { aiLogger } from "@oakai/logger";
+
+const log = aiLogger("exports");
+
+export function imageReplacements(
+  markdownImages: { url: string; altText: string; startIndex: number }[],
+): { requests: docs_v1.Schema$Request[] } {
+  if (markdownImages.length === 0) {
+    log.info("No Markdown images to process.");
+    return { requests: [] };
+  }
+
+  let cumulativeShift = 0; // Tracks the total index shift from previous operations
+
+  const requests: docs_v1.Schema$Request[] = [];
+
+  markdownImages.forEach((image) => {
+    // Construct the full Markdown reference
+    const markdownImageReference = `![${image.altText}](${image.url})`;
+
+    const markdownLength = markdownImageReference.length;
+
+    // Adjust the start and end index dynamically based on the cumulative shift
+    const adjustedStartIndex = image.startIndex + cumulativeShift;
+    const adjustedEndIndex = adjustedStartIndex + markdownLength;
+
+    // Request to delete the exact range of the Markdown reference
+    requests.push({
+      deleteContentRange: {
+        range: {
+          startIndex: adjustedStartIndex,
+          endIndex: adjustedEndIndex,
+        },
+      },
+    });
+
+    // Request to insert the inline image at the adjusted startIndex
+    requests.push({
+      insertInlineImage: {
+        uri: image.url,
+        location: {
+          index: adjustedStartIndex, // Insert at the same startIndex where the Markdown was removed
+        },
+        objectSize: {
+          height: {
+            magnitude: 150,
+            unit: "PT",
+          },
+          width: {
+            magnitude: 150,
+            unit: "PT",
+          },
+        },
+      },
+    });
+    const netShift = 1 - markdownLength; // Inline image adds 1, Markdown removes its length
+    cumulativeShift += netShift;
+  });
+
+  return { requests };
+}
diff --git a/packages/exports/src/gSuite/docs/populateDoc.ts b/packages/exports/src/gSuite/docs/populateDoc.ts
index 2af3b893d..3f27edc5d 100644
--- a/packages/exports/src/gSuite/docs/populateDoc.ts
+++ b/packages/exports/src/gSuite/docs/populateDoc.ts
@@ -1,11 +1,17 @@
 import type { docs_v1 } from "@googleapis/docs";
+import { aiLogger } from "@oakai/logger";
 
 import type { Result } from "../../types";
-import type { ValueToString} from "../../utils";
+import type { ValueToString } from "../../utils";
 import { defaultValueToString } from "../../utils";
+import { findMarkdownImages } from "./findMarkdownImages";
+import { imageReplacements } from "./imageReplacements";
+import { textReplacements } from "./textReplacements";
+
+const log = aiLogger("exports");
 
 /**
- * @description Populates the template document with the given data.
+ * Populates the template document with the given data, handling image replacements for all placeholders.
  */
 export async function populateDoc<
   Data extends Record<string, string | string[] | null | undefined>,
@@ -23,37 +29,43 @@ export async function populateDoc<
   valueToString?: ValueToString<Data>;
 }): Promise<Result<{ missingData: string[] }>> {
   try {
-    const requests: docs_v1.Schema$Request[] = [];
     const missingData: string[] = [];
 
-    Object.entries(data).forEach(([key, value]) => {
-      const valueStr = valueToString(key, value);
-      if (!valueStr.trim() && warnIfMissing.includes(key)) {
-        missingData.push(key);
-      }
-      requests.push({
-        replaceAllText: {
-          replaceText: valueStr,
-          containsText: {
-            text: `{{${key}}}`,
-            matchCase: false,
-          },
+    const { requests: textRequests } = textReplacements({
+      data,
+      warnIfMissing,
+      valueToString,
+    });
+
+    if (textRequests.length > 0) {
+      await googleDocs.documents.batchUpdate({
+        documentId,
+        requestBody: {
+          requests: textRequests,
         },
       });
-    });
+    }
+
+    const markdownImages = await findMarkdownImages(googleDocs, documentId);
+
+    const { requests: imageRequests } = imageReplacements(markdownImages);
+
+    if (imageRequests.length > 0) {
+      await googleDocs.documents.batchUpdate({
+        documentId,
+        requestBody: {
+          requests: imageRequests,
+        },
+      });
+    }
 
-    await googleDocs.documents.batchUpdate({
-      documentId,
-      requestBody: {
-        requests,
-      },
-    });
     return {
       data: {
         missingData,
       },
     };
   } catch (error) {
+    log.error("Failed to populate document:", error);
     return {
       error,
       message: "Failed to populate doc template",
diff --git a/packages/exports/src/gSuite/docs/textReplacements.ts b/packages/exports/src/gSuite/docs/textReplacements.ts
new file mode 100644
index 000000000..58d613071
--- /dev/null
+++ b/packages/exports/src/gSuite/docs/textReplacements.ts
@@ -0,0 +1,36 @@
+import type { docs_v1 } from "@googleapis/docs";
+
+import type { ValueToString } from "../../utils";
+
+export function textReplacements<
+  Data extends Record<string, string | string[] | null | undefined>,
+>({
+  data,
+  warnIfMissing,
+  valueToString,
+}: {
+  data: Data;
+  warnIfMissing: (keyof Data)[];
+  valueToString: ValueToString<Data>;
+}): { requests: docs_v1.Schema$Request[]; missingData: string[] } {
+  const requests: docs_v1.Schema$Request[] = [];
+  const missingData: string[] = [];
+
+  Object.entries(data).forEach(([key, value]) => {
+    const valueStr = valueToString(key, value);
+    if (!valueStr.trim() && warnIfMissing.includes(key)) {
+      missingData.push(key);
+    }
+    requests.push({
+      replaceAllText: {
+        replaceText: valueStr,
+        containsText: {
+          text: `{{${key}}}`,
+          matchCase: false,
+        },
+      },
+    });
+  });
+
+  return { requests, missingData };
+}
diff --git a/packages/exports/src/gSuite/slides/deleteSlides.ts b/packages/exports/src/gSuite/slides/deleteSlides.ts
index 0e2370641..1b86378c1 100644
--- a/packages/exports/src/gSuite/slides/deleteSlides.ts
+++ b/packages/exports/src/gSuite/slides/deleteSlides.ts
@@ -2,6 +2,7 @@ import type { slides_v1 } from "@googleapis/slides";
 
 import type { Result } from "../../types";
 
+// #TODO Remove this string fallback and properly type the speaker notes tags
 export type SpeakerNotesTag = "cycle1" | "cycle2" | "cycle3" | string;
 
 function getSpeakerNotes(slide: slides_v1.Schema$Page): string {
diff --git a/packages/exports/src/schema/input.schema.ts b/packages/exports/src/schema/input.schema.ts
index ce7be09c7..19645e7f4 100644
--- a/packages/exports/src/schema/input.schema.ts
+++ b/packages/exports/src/schema/input.schema.ts
@@ -37,7 +37,7 @@ export const keywordSchema = z.object({
   definition: z.string(),
 });
 
-export const lessonSlidesInputSchema = z.object({
+export const lessonInputSchema = z.object({
   title: z.string(),
   subject: z.string(),
   keyStage: z.string().nullish(),
@@ -54,8 +54,14 @@ export const lessonSlidesInputSchema = z.object({
   cycle2: cycleSchema.nullish(),
   cycle3: cycleSchema.nullish(),
   additionalMaterials: z.string().nullish(),
+  _experimental_starterQuizMathsV0: quizSchema.nullish(),
+  _experimental_exitQuizMathsV0: quizSchema.nullish(),
 });
 
+export type LessonInputData = z.infer<typeof lessonInputSchema>;
+
+export const lessonSlidesInputSchema = lessonInputSchema;
+
 export type LessonSlidesInputData = z.infer<typeof lessonSlidesInputSchema>;
 
 export const lessonPlanDocInputSchema = lessonSlidesInputSchema;
diff --git a/packages/exports/src/utils.ts b/packages/exports/src/utils.ts
index fad51c770..a9667171e 100644
--- a/packages/exports/src/utils.ts
+++ b/packages/exports/src/utils.ts
@@ -17,7 +17,7 @@ export function getFileName({
 
 /**
  * @description
- * - If the value is falsey, an empty string is returned.
+ * - If the value is falsy, an empty string is returned.
  * - If the value is a string, it is returned as is.
  * - If the value is an array:
  *   - it defaults to joining with a newline character
@@ -75,7 +75,7 @@ export function processQuizAnswers(
   }
 
   if (sortAlpha) {
-    answers = [...answers, ...distractors].sort();
+    answers = [...answers, ...distractors].sort((a, b) => a.localeCompare(b));
   }
 
   if (prefixWithABC) {
diff --git a/packages/exports/tsconfig.json b/packages/exports/tsconfig.json
index 12018590d..b50112251 100644
--- a/packages/exports/tsconfig.json
+++ b/packages/exports/tsconfig.json
@@ -3,5 +3,8 @@
   "ts-node": {
     "files": true
   },
-  "include": ["src/**/*.ts", "index.ts", "*.ts"]
+  "include": ["src/**/*.ts", "index.ts", "*.ts"],
+  "compilerOptions": {
+    "baseUrl": "./src"
+  }
 }
diff --git a/packages/ingest/.eslintrc.cjs b/packages/ingest/.eslintrc.cjs
deleted file mode 100644
index 9526c3c79..000000000
--- a/packages/ingest/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["eslint-config-custom"],
-  parserOptions: {
-    project: __dirname + "/tsconfig.json",
-  },
-};
diff --git a/packages/ingest/jest.config.js b/packages/ingest/jest.config.js
deleted file mode 100644
index e22427243..000000000
--- a/packages/ingest/jest.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const { pathsToModuleNameMapper } = require("ts-jest");
-const { compilerOptions } = require("./tsconfig.test.json");
-
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-const config = {
-  transform: {
-    "^.+\\.tsx?$": [
-      "ts-jest",
-      {
-        tsconfig: "tsconfig.test.json",
-        useESM: true,
-      },
-    ],
-  },
-  preset: "ts-jest/presets/default-esm",
-  moduleNameMapper: {
-    ...pathsToModuleNameMapper(compilerOptions.paths, { prefix: "<rootDir>/" }),
-    "^(\\.{1,2}/.*)\\.js$": "$1",
-  },
-  extensionsToTreatAsEsm: [".ts"],
-  testEnvironment: "setup-polly-jest/jest-environment-node",
-  testMatch: ["**/*.test.ts"],
-  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  rootDir: ".",
-  resetMocks: true,
-};
-
-module.exports = config;
diff --git a/packages/ingest/jest.config.mjs b/packages/ingest/jest.config.mjs
new file mode 100644
index 000000000..125c98f56
--- /dev/null
+++ b/packages/ingest/jest.config.mjs
@@ -0,0 +1,40 @@
+import { readFile } from "fs/promises";
+import { pathsToModuleNameMapper } from "ts-jest";
+
+const tsconfig = JSON.parse(
+  await readFile(new URL("./tsconfig.test.json", import.meta.url)),
+);
+
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+const config = {
+  transform: {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        tsconfig: "tsconfig.test.json",
+        useESM: true,
+        isolatedModules: true,
+      },
+    ],
+  },
+  preset: "ts-jest/presets/default-esm",
+  moduleNameMapper: {
+    ...pathsToModuleNameMapper(tsconfig.compilerOptions.paths, {
+      prefix: "<rootDir>/",
+    }),
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+  },
+  extensionsToTreatAsEsm: [".ts"],
+  testEnvironment: "setup-polly-jest/jest-environment-node",
+  testMatch: ["**/*.test.ts"],
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+  rootDir: ".",
+  resetMocks: true,
+  collectCoverage:
+    process.env.CI === "true" || process.env.COLLECT_TEST_COVERAGE === "true",
+  coverageReporters: ["lcov", "text"],
+  collectCoverageFrom: ["src/**/*.{ts,tsx,js,jsx}"],
+  coverageDirectory: "coverage",
+};
+
+export default config;
diff --git a/packages/ingest/package.json b/packages/ingest/package.json
index 19ccaf7a0..0e8d76370 100644
--- a/packages/ingest/package.json
+++ b/packages/ingest/package.json
@@ -6,15 +6,23 @@
   "license": "ISC",
   "author": "",
   "main": "./index.ts",
+  "eslintConfig": {
+    "extends": "@oakai/eslint-config",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "rules": {}
+  },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "eslint .",
     "type-check": "tsc --noEmit",
     "ingest": "pnpm with-env ts-node --compiler-options {\\\"module\\\":\\\"CommonJS\\\"} ./src/index.ts",
     "with-env": "dotenv -e ../../.env --",
-    "test": "pnpm with-env jest --colors --config jest.config.js",
-    "test:seq": "pnpm with-env jest --colors --config jest.config.js --verbose --runInBand",
-    "test-file": "pnpm with-env jest --config jest.config.js --runTestsByPath TEST_FILEPATH"
+    "test": "pnpm with-env jest --colors --config jest.config.mjs",
+    "test:seq": "pnpm with-env jest --colors --config jest.config.mjs --verbose --runInBand",
+    "test-coverage": "COLLECT_TEST_COVERAGE=true pnpm with-env jest --colors --config jest.config.mjs --coverage",
+    "test-file": "pnpm with-env jest --config jest.config.mjs --runTestsByPath TEST_FILEPATH"
   },
   "prettier": "@oakai/prettier-config",
   "dependencies": {
@@ -30,12 +38,13 @@
     "zod": "3.23.8"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
+    "@oakai/eslint-config": "*",
+    "@oakai/prettier-config": "*",
+    "@types/jest": "^29.5.14",
     "@types/webvtt-parser": "^2.2.0",
-    "eslint": "^8.56.0",
     "jest": "^29.7.0",
-    "prettier-config": "*",
     "setup-polly-jest": "^0.11.0",
-    "ts-jest": "^29.1.4"
-  }
+    "ts-jest": "^29.2.5"
+  },
+  "type": "module"
 }
diff --git a/packages/ingest/src/captions/getCaptionsByFileName.ts b/packages/ingest/src/captions/getCaptionsByFileName.ts
index 84a752fc7..d6017b162 100644
--- a/packages/ingest/src/captions/getCaptionsByFileName.ts
+++ b/packages/ingest/src/captions/getCaptionsByFileName.ts
@@ -1,6 +1,6 @@
 import { Storage } from "@google-cloud/storage";
 import { aiLogger } from "@oakai/logger";
-import type { Cue} from "webvtt-parser";
+import type { Cue } from "webvtt-parser";
 import { WebVTTParser } from "webvtt-parser";
 
 const log = aiLogger("ingest");
@@ -74,7 +74,13 @@ async function getFileFromBucket(bucketName: string, fileName: string) {
     return contents.toString();
   } catch (err) {
     log.error(
-      `Error fetching file: ${fileName} from bucket: ${bucketName}. Error: ${err}`,
+      `Error fetching file: ${fileName} from bucket: ${bucketName}. Error: ${
+        typeof err === "string"
+          ? err
+          : err instanceof Error
+            ? err.message
+            : JSON.stringify(err)
+      }`,
     );
     return;
   }
diff --git a/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts b/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts
index 14a4b1246..3f32818ed 100644
--- a/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts
+++ b/packages/ingest/src/embedding/handleEmbeddingBatchSuccess.ts
@@ -72,6 +72,9 @@ export async function handleEmbeddingBatchSuccess({
       continue;
     }
 
+    if (errors.length > 0) {
+      log.info(`Errors: ${errors.length}`);
+    }
     lessonIdsCompleted.add(lessonId);
   }
 
diff --git a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/toMarkdownList.ts b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/toMarkdownList.ts
index d74cb5c9b..36599db33 100644
--- a/packages/ingest/src/generate-lesson-plans/user-prompt-parts/toMarkdownList.ts
+++ b/packages/ingest/src/generate-lesson-plans/user-prompt-parts/toMarkdownList.ts
@@ -3,6 +3,9 @@ export function toMarkdownList<T>(
   getListItemText?: (item: T, i: number) => string,
 ) {
   return items
-    .map((item, i) => `- ${getListItemText ? getListItemText(item, i) : item}`)
+    .map(
+      (item, i) =>
+        `- ${getListItemText ? getListItemText(item, i) : String(item)}`,
+    )
     .join("\n");
 }
diff --git a/packages/ingest/src/import-lessons/importLessonsFromCSV.ts b/packages/ingest/src/import-lessons/importLessonsFromCSV.ts
index 8e473ef27..a9cda5036 100644
--- a/packages/ingest/src/import-lessons/importLessonsFromCSV.ts
+++ b/packages/ingest/src/import-lessons/importLessonsFromCSV.ts
@@ -77,13 +77,15 @@ export function importLessonsFromCSV({
           onError(
             new IngestError("Failed to import from CSV", { ingestId, cause }),
           );
-          reject();
+          reject(cause);
         });
     } catch (cause) {
-      onError(
-        new IngestError("Failed to import from CSV", { ingestId, cause }),
-      );
-      reject();
+      const rejection = new IngestError("Failed to import from CSV", {
+        ingestId,
+        cause,
+      });
+      onError(rejection);
+      reject(rejection);
     }
   });
 }
diff --git a/packages/ingest/src/openai-batches/customId.ts b/packages/ingest/src/openai-batches/customId.ts
index e88159661..c94e91d97 100644
--- a/packages/ingest/src/openai-batches/customId.ts
+++ b/packages/ingest/src/openai-batches/customId.ts
@@ -24,14 +24,6 @@ export function createCustomId(props: CreateCustomIdProps): string {
   }
 }
 
-export function parseCustomId(props: {
-  task: "generate-lesson-plans";
-  customId: string;
-}): GenerateLessonPlanCustomIdComponents;
-export function parseCustomId(props: {
-  task: "embed-lesson-plan-parts";
-  customId: string;
-}): EmbedLessonPlanPartsCustomIdComponents;
 export function parseCustomId(props: { task: BatchTask; customId: string }) {
   switch (props.task) {
     case "generate-lesson-plans":
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 d32a97d27..441265218 100644
--- a/packages/ingest/src/steps/5-lp-parts-embed-start.ts
+++ b/packages/ingest/src/steps/5-lp-parts-embed-start.ts
@@ -78,7 +78,9 @@ export async function lpPartsEmbedStart({
           await prisma.ingestLessonPlanPart.updateMany({
             where: {
               id: {
-                in: lessonPlanPartIds,
+                in: lessonPlanPartIds.filter(
+                  (i): i is string => typeof i === "string",
+                ),
               },
             },
             data: {
diff --git a/packages/ingest/tsconfig.json b/packages/ingest/tsconfig.json
index f19105fbf..6731c27c1 100644
--- a/packages/ingest/tsconfig.json
+++ b/packages/ingest/tsconfig.json
@@ -4,8 +4,11 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "esModuleInterop": true,
-    "types": ["jest"]
+    "types": ["jest"],
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
+    "baseUrl": "./src"
   }
 }
diff --git a/packages/ingest/tsconfig.test.json b/packages/ingest/tsconfig.test.json
index f7bc25af4..573bbac19 100644
--- a/packages/ingest/tsconfig.test.json
+++ b/packages/ingest/tsconfig.test.json
@@ -10,8 +10,10 @@
     "incremental": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
     "isolatedModules": true,
     "noEmit": true,
     "types": ["jest", "node"],
diff --git a/packages/logger/.eslintrc.cjs b/packages/logger/.eslintrc.cjs
deleted file mode 100644
index 69a283b61..000000000
--- a/packages/logger/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["../../.eslintrc.cjs"],
-  rules: {
-    "no-console": "off",
-  },
-};
diff --git a/packages/logger/browser.ts b/packages/logger/browser.ts
index 29699b63a..087cef52a 100644
--- a/packages/logger/browser.ts
+++ b/packages/logger/browser.ts
@@ -1,3 +1,4 @@
+/* eslint-env browser */
 import pino from "pino";
 
 /**
diff --git a/packages/logger/eslint.config.mjs b/packages/logger/eslint.config.mjs
new file mode 100644
index 000000000..7b56618ac
--- /dev/null
+++ b/packages/logger/eslint.config.mjs
@@ -0,0 +1,24 @@
+import baseConfig from "@oakai/eslint-config";
+
+const config = [...baseConfig];
+
+// Get the last config object
+const tsConfig = config.find((i) => i.files?.[0] === "**/*.{ts,tsx}");
+
+// Modify the rules of the last config object
+if (tsConfig && typeof tsConfig === "object" && "rules" in tsConfig) {
+  tsConfig.rules = {
+    ...tsConfig.rules,
+    "no-console": "off",
+  };
+} else {
+  // If the last item isn't a config object with rules, append a new config object
+  config.push({
+    files: ["**/*.{ts,tsx}"],
+    rules: {
+      "no-console": "off",
+    },
+  });
+}
+
+export default config;
diff --git a/packages/logger/index.ts b/packages/logger/index.ts
index 555179d60..11f7d85fe 100644
--- a/packages/logger/index.ts
+++ b/packages/logger/index.ts
@@ -19,6 +19,7 @@ type ChildKey =
   | "aila"
   | "aila:analytics"
   | "aila:categorisation"
+  | "aila:chat"
   | "aila:errors"
   | "aila:lesson"
   | "aila:llm"
@@ -31,6 +32,7 @@ type ChildKey =
   | "aila:rag"
   | "aila:testing"
   | "aila:chat"
+  | "aila:experimental-patches"
   | "analytics"
   | "app"
   | "auth"
@@ -52,8 +54,10 @@ type ChildKey =
   | "moderation"
   | "prompts"
   | "qd"
+  | "quiz"
   | "rag"
   | "rate-limiting"
+  | "scrolling"
   | "snippets"
   | "testing"
   | "tracing"
@@ -84,7 +88,6 @@ const errorLogger =
  */
 export function aiLogger(childKey: ChildKey) {
   const debugLogger = debugBase.extend(childKey);
-
   return {
     info: debugLogger,
     warn: debugLogger,
diff --git a/packages/logger/package.json b/packages/logger/package.json
index dd59f2bcd..0f9b39873 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -8,7 +8,7 @@
   "main": "./index.ts",
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "eslint --config ./eslint.config.mjs .",
     "type-check": "tsc --noEmit"
   },
   "prettier": "@oakai/prettier-config",
@@ -17,7 +17,8 @@
     "pino": "^8.15.1"
   },
   "devDependencies": {
-    "pino-pretty": "^10.2.0",
-    "prettier-config": "*"
-  }
+    "@oakai/prettier-config": "*",
+    "pino-pretty": "^10.2.0"
+  },
+  "type": "module"
 }
diff --git a/packages/logger/structuredLogger.ts b/packages/logger/structuredLogger.ts
index 6e8903a55..925571347 100644
--- a/packages/logger/structuredLogger.ts
+++ b/packages/logger/structuredLogger.ts
@@ -1,12 +1,12 @@
 import pino from "pino";
 
 const logger = pino({
-  level: process.env.NEXT_PUBLIC_PINO_LOG_LEVEL || "info",
+  level: process.env.NEXT_PUBLIC_PINO_LOG_LEVEL ?? "info",
   browser: {
     write(obj) {
       const msg = "msg" in obj && obj.msg;
       console.warn(
-        `Invalid use of @oakai/logger, use logger/browser, logMessage=${msg}`,
+        `Invalid use of @oakai/logger, use logger/browser, logMessage=${JSON.stringify(msg)}`,
       );
     },
   },
diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json
index 205dae069..fd9b75698 100644
--- a/packages/logger/tsconfig.json
+++ b/packages/logger/tsconfig.json
@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src", "index.ts", "*.ts"]
+  "include": ["src", "index.ts", "*.ts","eslint.config.mjs"]
 }
diff --git a/packages/prettier-config/index.js b/packages/prettier-config/index.mjs
similarity index 89%
rename from packages/prettier-config/index.js
rename to packages/prettier-config/index.mjs
index b00111748..4d2686828 100644
--- a/packages/prettier-config/index.js
+++ b/packages/prettier-config/index.mjs
@@ -1,4 +1,5 @@
-module.exports = {
+/** @type {import('prettier').Config} */
+export default {
   plugins: [
     "@trivago/prettier-plugin-sort-imports",
     "prettier-plugin-tailwindcss"
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 54b0d6d23..84a1772ab 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,15 +1,14 @@
 {
   "name": "@oakai/prettier-config",
-  "version": "0.0.0",
-  "main": "index.js",
-  "dependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "prettier-plugin-tailwindcss": "^0.5.9"
-  },
+  "version": "1.0.0",
+  "main": "index.mjs",
   "devDependencies": {
-    "prettier": "^3.1.1"
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "prettier": "^3.4.1",
+    "prettier-plugin-tailwindcss": "^0.6.9"
   },
   "peerDependencies": {
     "prettier": "^3.1.1"
-  }
+  },
+  "type": "module"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c7ef31143..335534291 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,12 +20,12 @@ importers:
       '@next/env':
         specifier: 14.2.18
         version: 14.2.18
+      '@oakai/eslint-config':
+        specifier: '*'
+        version: link:packages/eslint-config
       '@oakai/prettier-config':
         specifier: '*'
         version: link:packages/prettier-config
-      '@prisma/client':
-        specifier: 5.16.1
-        version: 5.16.1(prisma@5.16.1)
       '@semantic-release/changelog':
         specifier: ^6.0.3
         version: 6.0.3(semantic-release@21.1.2)
@@ -36,17 +36,14 @@ importers:
         specifier: ^10.0.1
         version: 10.0.1(semantic-release@21.1.2)
       '@types/jest':
-        specifier: ^29.5.12
-        version: 29.5.12
+        specifier: ^29.5.14
+        version: 29.5.14
       autoprefixer:
         specifier: ^10.4.16
         version: 10.4.17(postcss@8.4.35)
-      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)
+      dependency-cruiser:
+        specifier: ^16.7.0
+        version: 16.8.0
       husky:
         specifier: ^8.0.3
         version: 8.0.3
@@ -60,23 +57,23 @@ importers:
         specifier: ^8.4.32
         version: 8.4.35
       prettier:
-        specifier: ^3.1.1
-        version: 3.3.3
+        specifier: ^3.4.1
+        version: 3.4.2
       semantic-release:
         specifier: ^21.1.1
-        version: 21.1.2(typescript@5.3.3)
+        version: 21.1.2(typescript@5.7.2)
+      sonarqube-scanner:
+        specifier: ^4.2.6
+        version: 4.2.6
       sort-package-json:
         specifier: ^2.6.0
         version: 2.6.0
-      tailwindcss:
-        specifier: ^3.3.7
-        version: 3.4.1(ts-node@10.9.2)
       turbo:
         specifier: ^2.2.3
         version: 2.2.3
       typescript:
-        specifier: 5.3.3
-        version: 5.3.3
+        specifier: 5.7.2
+        version: 5.7.2
 
   apps/nextjs:
     dependencies:
@@ -122,6 +119,9 @@ importers:
       '@oakai/db':
         specifier: '*'
         version: link:../../packages/db
+      '@oakai/eslint-config':
+        specifier: '*'
+        version: link:../../packages/eslint-config
       '@oakai/exports':
         specifier: '*'
         version: link:../../packages/exports
@@ -141,11 +141,11 @@ importers:
         specifier: ^3.1.0
         version: 3.1.0(react@18.2.0)
       '@prisma/client':
-        specifier: 5.16.1
+        specifier: ^5.16.1
         version: 5.16.1(prisma@5.16.1)
       '@prisma/extension-accelerate':
-        specifier: ^1.0.0
-        version: 1.0.0(@prisma/client@5.16.1)
+        specifier: ^1.2.1
+        version: 1.2.1(@prisma/client@5.16.1)
       '@radix-ui/react-accordion':
         specifier: ^1.1.2
         version: 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
@@ -276,11 +276,11 @@ importers:
         specifier: ^1.2.2
         version: 1.2.2
       posthog-js:
-        specifier: ^1.139.1
-        version: 1.139.1
+        specifier: ^1.201.0
+        version: 1.202.2
       posthog-node:
-        specifier: ^4.0.0
-        version: 4.0.0
+        specifier: ^4.3.2
+        version: 4.3.2
       pptxgenjs:
         specifier: ^3.12.0
         version: 3.12.0
@@ -319,7 +319,7 @@ importers:
         version: 1.29.0
       storybook:
         specifier: ^8.4.1
-        version: 8.4.1(prettier@3.3.3)
+        version: 8.4.1(prettier@3.4.2)
       superjson:
         specifier: ^1.9.1
         version: 1.12.0
@@ -340,7 +340,7 @@ importers:
         version: 1.2.0(@trpc/server@10.45.2)(zod@3.23.8)
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@18.18.5)(typescript@5.3.3)
+        version: 10.9.2(@types/node@20.17.10)(typescript@5.7.2)
       tsx:
         specifier: ^4.16.0
         version: 4.16.0
@@ -368,7 +368,7 @@ importers:
         version: 1.7.0(@playwright/test@1.47.2)
       '@graphql-codegen/cli':
         specifier: ^5.0.2
-        version: 5.0.2(@types/node@18.18.5)(graphql@16.9.0)(typescript@5.3.3)
+        version: 5.0.2(@types/node@20.17.10)(graphql@16.9.0)(typescript@5.7.2)
       '@graphql-codegen/typescript':
         specifier: ^4.0.9
         version: 4.0.9(graphql@16.9.0)
@@ -398,10 +398,10 @@ importers:
         version: 8.4.1(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)
       '@storybook/nextjs':
         specifier: ^8.4.1
-        version: 8.4.1(esbuild@0.21.5)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3)(webpack@5.93.0)
+        version: 8.4.1(esbuild@0.21.5)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2)(webpack@5.93.0)
       '@storybook/react':
         specifier: ^8.4.1
-        version: 8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3)
+        version: 8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2)
       '@storybook/test':
         specifier: ^8.4.1
         version: 8.4.1(storybook@8.4.1)
@@ -412,11 +412,11 @@ importers:
         specifier: ^2.0.6
         version: 2.0.6
       '@types/jest':
-        specifier: ^29.5.12
-        version: 29.5.12
+        specifier: ^29.5.14
+        version: 29.5.14
       '@types/node':
-        specifier: ^18.17.0
-        version: 18.18.5
+        specifier: ^20.9.0
+        version: 20.17.10
       '@types/react':
         specifier: ^18.2.37
         version: 18.2.57
@@ -438,24 +438,15 @@ importers:
       dotenv-cli:
         specifier: ^6.0.0
         version: 6.0.0
-      eslint:
-        specifier: ^8.56.0
-        version: 8.56.0
-      eslint-config-next:
-        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)
       graphql:
         specifier: ^16.9.0
         version: 16.9.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+        version: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       msw:
         specifier: ^2.6.5
-        version: 2.6.5(@types/node@18.18.5)(typescript@5.3.3)
+        version: 2.6.5(@types/node@20.17.10)(typescript@5.7.2)
       msw-storybook-addon:
         specifier: ^2.0.4
         version: 2.0.4(msw@2.6.5)
@@ -466,11 +457,11 @@ importers:
         specifier: ^3.3.7
         version: 3.4.1(ts-node@10.9.2)
       ts-jest:
-        specifier: ^29.1.4
-        version: 29.1.4(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.3.3)
+        specifier: ^29.2.5
+        version: 29.2.5(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.7.2)
       typescript:
-        specifier: 5.3.3
-        version: 5.3.3
+        specifier: 5.7.2
+        version: 5.7.2
       web-streams-polyfill:
         specifier: ^4.0.0
         version: 4.0.0
@@ -538,6 +529,9 @@ importers:
         specifier: ^3.23.0
         version: 3.23.0(zod@3.23.8)
     devDependencies:
+      '@oakai/eslint-config':
+        specifier: '*'
+        version: link:../eslint-config
       '@oakai/prettier-config':
         specifier: '*'
         version: link:../prettier-config
@@ -554,26 +548,20 @@ importers:
         specifier: ^6.0.6
         version: 6.0.6
       '@types/jest':
-        specifier: ^29.5.12
-        version: 29.5.12
-      eslint:
-        specifier: ^8.56.0
-        version: 8.56.0
-      eslint-plugin-turbo:
-        specifier: ^2.2.3
-        version: 2.2.3(eslint@8.56.0)
+        specifier: ^29.5.14
+        version: 29.5.14
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+        version: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       setup-polly-jest:
         specifier: ^0.11.0
         version: 0.11.0(@pollyjs/core@6.0.6)
       ts-jest:
-        specifier: ^29.1.4
-        version: 29.1.4(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.3.3)
+        specifier: ^29.2.5
+        version: 29.2.5(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.7.2)
       typescript:
-        specifier: 5.3.3
-        version: 5.3.3
+        specifier: 5.7.2
+        version: 5.7.2
 
   packages/api:
     dependencies:
@@ -614,15 +602,15 @@ importers:
         specifier: 3.23.8
         version: 3.23.8
     devDependencies:
+      '@oakai/eslint-config':
+        specifier: '*'
+        version: link:../eslint-config
       '@oakai/prettier-config':
         specifier: '*'
         version: link:../prettier-config
-      eslint:
-        specifier: ^8.56.0
-        version: 8.56.0
       typescript:
-        specifier: 5.3.3
-        version: 5.3.3
+        specifier: 5.7.2
+        version: 5.7.2
 
   packages/core:
     dependencies:
@@ -673,7 +661,7 @@ importers:
         version: 9.7.0
       inngest:
         specifier: ^3.16.1
-        version: 3.16.1(typescript@5.3.3)
+        version: 3.16.1(typescript@5.7.2)
       json-stringify-safe:
         specifier: ^5.0.1
         version: 5.0.1
@@ -697,7 +685,7 @@ importers:
         version: 1.3.1
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@18.18.5)(typescript@5.3.3)
+        version: 10.9.2(@types/node@20.17.10)(typescript@5.7.2)
       untruncate-json:
         specifier: ^0.0.1
         version: 0.0.1
@@ -724,8 +712,11 @@ importers:
         specifier: '*'
         version: link:../logger
       '@prisma/client':
-        specifier: 5.16.1
+        specifier: ^5.16.1
         version: 5.16.1(prisma@5.16.1)
+      '@prisma/extension-accelerate':
+        specifier: ^1.2.1
+        version: 1.2.1(@prisma/client@5.16.1)
       '@types/chunk-text':
         specifier: ^1.0.0
         version: 1.0.0
@@ -752,11 +743,14 @@ importers:
         version: 1.0.225
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@18.18.5)(typescript@5.3.3)
+        version: 10.9.2(@types/node@20.17.10)(typescript@5.7.2)
       yaml:
         specifier: ^2.4.1
         version: 2.4.1
     devDependencies:
+      '@oakai/eslint-config':
+        specifier: '*'
+        version: link:../eslint-config
       '@oakai/prettier-config':
         specifier: '*'
         version: link:../prettier-config
@@ -767,57 +761,80 @@ importers:
         specifier: 5.16.1
         version: 5.16.1
       typescript:
-        specifier: 5.3.3
-        version: 5.3.3
+        specifier: 5.7.2
+        version: 5.7.2
       zod-prisma:
         specifier: ^0.5.4
         version: 0.5.4(prisma@5.16.1)(zod@3.23.8)
 
-  packages/eslint-config-custom:
-    dependencies:
+  packages/eslint-config:
+    devDependencies:
+      '@eslint/js':
+        specifier: ^9.16.0
+        version: 9.17.0
+      '@next/eslint-plugin-next':
+        specifier: ^15.0.3
+        version: 15.1.1
       '@rushstack/eslint-patch':
-        specifier: ^1.6.1
-        version: 1.7.2
+        specifier: ^1.10.4
+        version: 1.10.4
+      '@types/eslint-config-prettier':
+        specifier: ^6.11.3
+        version: 6.11.3
+      '@types/node':
+        specifier: ^20.9.0
+        version: 20.17.10
       '@typescript-eslint/eslint-plugin':
-        specifier: ^7.18.0
-        version: 7.18.0(@typescript-eslint/parser@7.18.0)(eslint@8.56.0)(typescript@5.3.3)
+        specifier: ^8.17.0
+        version: 8.18.1(@typescript-eslint/parser@8.18.1)(eslint@9.17.0)(typescript@5.7.2)
       '@typescript-eslint/parser':
-        specifier: ^7.18.0
-        version: 7.18.0(eslint@8.56.0)(typescript@5.3.3)
+        specifier: ^8.17.0
+        version: 8.18.1(eslint@9.17.0)(typescript@5.7.2)
       '@typescript-eslint/typescript-estree':
-        specifier: ^7.18.0
-        version: 7.18.0(typescript@5.3.3)
+        specifier: ^8.12.2
+        version: 8.18.1(typescript@5.7.2)
+      eslint:
+        specifier: ^9.16.0
+        version: 9.17.0
       eslint-config-next:
-        specifier: 15.0.1
-        version: 15.0.1(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 15.0.3
+        version: 15.0.3(eslint@9.17.0)(typescript@5.7.2)
+      eslint-config-prettier:
+        specifier: ^9.1.0
+        version: 9.1.0(eslint@9.17.0)
+      eslint-plugin-import:
+        specifier: ^2.31.0
+        version: 2.31.0(@typescript-eslint/parser@8.18.1)(eslint-import-resolver-typescript@3.5.2)(eslint@9.17.0)
       eslint-plugin-jest:
-        specifier: ^28.8.3
-        version: 28.8.3(@typescript-eslint/eslint-plugin@7.18.0)(eslint@8.56.0)(typescript@5.3.3)
+        specifier: ^28.9.0
+        version: 28.9.0(@typescript-eslint/eslint-plugin@8.18.1)(eslint@9.17.0)(typescript@5.7.2)
+      eslint-plugin-prettier:
+        specifier: ^5.2.1
+        version: 5.2.1(eslint-config-prettier@9.1.0)(eslint@9.17.0)(prettier@3.4.2)
       eslint-plugin-react:
         specifier: ^7.37.2
-        version: 7.37.2(eslint@8.56.0)
+        version: 7.37.2(eslint@9.17.0)
       eslint-plugin-react-hooks:
         specifier: ^5.0.0
-        version: 5.0.0(eslint@8.56.0)
+        version: 5.0.0(eslint@9.17.0)
+      eslint-plugin-storybook:
+        specifier: ^0.11.1
+        version: 0.11.1(eslint@9.17.0)(typescript@5.7.2)
       eslint-plugin-turbo:
-        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)
+        specifier: ^2.3.3
+        version: 2.3.3(eslint@9.17.0)
+      globals:
+        specifier: ^15.13.0
+        version: 15.14.0
       prettier:
-        specifier: ^3.1.1
-        version: 3.3.3
+        specifier: ^3.4.1
+        version: 3.4.2
+      ts-node:
+        specifier: ^10.9.2
+        version: 10.9.2(@types/node@20.17.10)(typescript@5.7.2)
       typescript:
-        specifier: 5.3.3
-        version: 5.3.3
+        specifier: 5.7.2
+        version: 5.7.2
 
   packages/exports:
     dependencies:
@@ -825,8 +842,8 @@ importers:
         specifier: '*'
         version: link:../logger
       typescript:
-        specifier: 5.3.3
-        version: 5.3.3
+        specifier: 5.7.2
+        version: 5.7.2
 
   packages/ingest:
     dependencies:
@@ -861,27 +878,27 @@ importers:
         specifier: 3.23.8
         version: 3.23.8
     devDependencies:
+      '@oakai/eslint-config':
+        specifier: '*'
+        version: link:../eslint-config
+      '@oakai/prettier-config':
+        specifier: '*'
+        version: link:../prettier-config
       '@types/jest':
-        specifier: ^29.5.12
-        version: 29.5.12
+        specifier: ^29.5.14
+        version: 29.5.14
       '@types/webvtt-parser':
         specifier: ^2.2.0
         version: 2.2.0
-      eslint:
-        specifier: ^8.56.0
-        version: 8.56.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
-      prettier-config:
-        specifier: '*'
-        version: 1.0.0
+        version: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       setup-polly-jest:
         specifier: ^0.11.0
         version: 0.11.0(@pollyjs/core@6.0.6)
       ts-jest:
-        specifier: ^29.1.4
-        version: 29.1.4(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.3.3)
+        specifier: ^29.2.5
+        version: 29.2.5(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.7.2)
 
   packages/logger:
     dependencies:
@@ -892,25 +909,24 @@ importers:
         specifier: ^8.15.1
         version: 8.15.1
     devDependencies:
+      '@oakai/prettier-config':
+        specifier: '*'
+        version: link:../prettier-config
       pino-pretty:
         specifier: ^10.2.0
         version: 10.2.0
-      prettier-config:
-        specifier: '*'
-        version: 1.0.0
 
   packages/prettier-config:
-    dependencies:
+    devDependencies:
       '@trivago/prettier-plugin-sort-imports':
         specifier: ^4.3.0
-        version: 4.3.0(prettier@3.2.5)
-      prettier-plugin-tailwindcss:
-        specifier: ^0.5.9
-        version: 0.5.11(@trivago/prettier-plugin-sort-imports@4.3.0)(prettier@3.2.5)
-    devDependencies:
+        version: 4.3.0(prettier@3.4.2)
       prettier:
-        specifier: ^3.1.1
-        version: 3.2.5
+        specifier: ^3.4.1
+        version: 3.4.2
+      prettier-plugin-tailwindcss:
+        specifier: ^0.6.9
+        version: 0.6.9(@trivago/prettier-plugin-sort-imports@4.3.0)(prettier@3.4.2)
 
   packages/rag:
     dependencies:
@@ -941,16 +957,17 @@ importers:
         version: 29.5.14
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+        version: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       ts-jest:
         specifier: ^29.2.5
-        version: 29.2.5(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.3)
+        version: 29.2.5(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.7.2)
 
 packages:
 
   /@aashutoshrathi/word-wrap@1.2.6:
     resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /@actions/core@1.10.1:
     resolution: {integrity: sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==}
@@ -1090,7 +1107,7 @@ packages:
       '@ai-sdk/provider-utils': 1.0.17(zod@3.23.8)
       '@ai-sdk/ui-utils': 0.0.40(zod@3.23.8)
       swrv: 1.0.4(vue@3.4.26)
-      vue: 3.4.26(typescript@5.3.3)
+      vue: 3.4.26(typescript@5.7.2)
     transitivePeerDependencies:
       - zod
     dev: false
@@ -1218,7 +1235,7 @@ packages:
       '@babel/types': 7.22.10
       jsesc: 2.5.2
       source-map: 0.5.7
-    dev: false
+    dev: true
 
   /@babel/generator@7.23.4:
     resolution: {integrity: sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==}
@@ -1228,7 +1245,7 @@ packages:
       '@jridgewell/gen-mapping': 0.3.3
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
-    dev: false
+    dev: true
 
   /@babel/generator@7.24.5:
     resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==}
@@ -1437,7 +1454,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.23.4
-    dev: false
+    dev: true
 
   /@babel/helper-split-export-declaration@7.24.5:
     resolution: {integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==}
@@ -1448,12 +1465,12 @@ packages:
   /@babel/helper-string-parser@7.22.5:
     resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
     engines: {node: '>=6.9.0'}
-    dev: false
+    dev: true
 
   /@babel/helper-string-parser@7.23.4:
     resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
     engines: {node: '>=6.9.0'}
-    dev: false
+    dev: true
 
   /@babel/helper-string-parser@7.24.1:
     resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==}
@@ -1519,14 +1536,14 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@babel/types': 7.22.10
-    dev: false
+    dev: true
 
   /@babel/parser@7.23.4:
     resolution: {integrity: sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==}
     engines: {node: '>=6.0.0'}
     dependencies:
       '@babel/types': 7.23.4
-    dev: false
+    dev: true
 
   /@babel/parser@7.24.5:
     resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
@@ -2715,13 +2732,13 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
+    dev: true
 
   /@babel/traverse@7.24.5:
     resolution: {integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.24.2
+      '@babel/code-frame': 7.24.7
       '@babel/generator': 7.24.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
@@ -2754,7 +2771,7 @@ packages:
     dependencies:
       '@babel/helper-validator-identifier': 7.24.5
       to-fast-properties: 2.0.0
-    dev: false
+    dev: true
 
   /@babel/types@7.22.10:
     resolution: {integrity: sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==}
@@ -2763,7 +2780,7 @@ packages:
       '@babel/helper-string-parser': 7.22.5
       '@babel/helper-validator-identifier': 7.24.5
       to-fast-properties: 2.0.0
-    dev: false
+    dev: true
 
   /@babel/types@7.23.4:
     resolution: {integrity: sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==}
@@ -2772,7 +2789,7 @@ packages:
       '@babel/helper-string-parser': 7.23.4
       '@babel/helper-validator-identifier': 7.24.5
       to-fast-properties: 2.0.0
-    dev: false
+    dev: true
 
   /@babel/types@7.24.5:
     resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==}
@@ -3065,7 +3082,7 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@types/buffer-from': 1.1.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       '@types/pako': 1.0.7
       buffer-from: 1.1.2
       cross-fetch: 3.1.8
@@ -3350,42 +3367,77 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0):
+  /@eslint-community/eslint-utils@4.4.0(eslint@9.17.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
     dependencies:
-      eslint: 8.56.0
+      eslint: 9.17.0
       eslint-visitor-keys: 3.4.3
+    dev: true
 
   /@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: true
 
-  /@eslint-community/regexpp@4.6.2:
-    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
+  /@eslint-community/regexpp@4.12.1:
+    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+    dev: true
 
-  /@eslint/eslintrc@2.1.4:
-    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@eslint/config-array@0.19.1:
+    resolution: {integrity: sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dependencies:
+      '@eslint/object-schema': 2.1.5
+      debug: 4.3.7(supports-color@5.5.0)
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@eslint/core@0.9.1:
+    resolution: {integrity: sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dependencies:
+      '@types/json-schema': 7.0.15
+    dev: true
+
+  /@eslint/eslintrc@3.2.0:
+    resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.7(supports-color@5.5.0)
-      espree: 9.6.1
-      globals: 13.21.0
-      ignore: 5.2.4
+      espree: 10.3.0
+      globals: 14.0.0
+      ignore: 5.3.2
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       minimatch: 3.1.2
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /@eslint/js@8.56.0:
-    resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@eslint/js@9.17.0:
+    resolution: {integrity: sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dev: true
+
+  /@eslint/object-schema@2.1.5:
+    resolution: {integrity: sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dev: true
+
+  /@eslint/plugin-kit@0.2.4:
+    resolution: {integrity: sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dependencies:
+      levn: 0.4.1
+    dev: true
 
   /@estruyf/github-actions-reporter@1.7.0(@playwright/test@1.47.2):
     resolution: {integrity: sha512-Kucb/LNB9HnU4w1wIxiVyhcLajlT1p/Gs3yyNb4D/skz371Jy67dmq8pb3pL9SEGFXMxQVkHlQL5TegPux/9ag==}
@@ -3523,7 +3575,7 @@ packages:
       tslib: 2.6.2
     dev: true
 
-  /@graphql-codegen/cli@5.0.2(@types/node@18.18.5)(graphql@16.9.0)(typescript@5.3.3):
+  /@graphql-codegen/cli@5.0.2(@types/node@20.17.10)(graphql@16.9.0)(typescript@5.7.2):
     resolution: {integrity: sha512-MBIaFqDiLKuO4ojN6xxG9/xL9wmfD3ZjZ7RsPjwQnSHBCUXnEkdKvX+JVpx87Pq29Ycn8wTJUguXnTZ7Di0Mlw==}
     hasBin: true
     peerDependencies:
@@ -3542,20 +3594,20 @@ packages:
       '@graphql-tools/apollo-engine-loader': 8.0.1(graphql@16.9.0)
       '@graphql-tools/code-file-loader': 8.1.3(graphql@16.9.0)
       '@graphql-tools/git-loader': 8.0.7(graphql@16.9.0)
-      '@graphql-tools/github-loader': 8.0.1(@types/node@18.18.5)(graphql@16.9.0)
+      '@graphql-tools/github-loader': 8.0.1(@types/node@20.17.10)(graphql@16.9.0)
       '@graphql-tools/graphql-file-loader': 8.0.1(graphql@16.9.0)
       '@graphql-tools/json-file-loader': 8.0.1(graphql@16.9.0)
       '@graphql-tools/load': 8.0.2(graphql@16.9.0)
-      '@graphql-tools/prisma-loader': 8.0.4(@types/node@18.18.5)(graphql@16.9.0)
-      '@graphql-tools/url-loader': 8.0.2(@types/node@18.18.5)(graphql@16.9.0)
+      '@graphql-tools/prisma-loader': 8.0.4(@types/node@20.17.10)(graphql@16.9.0)
+      '@graphql-tools/url-loader': 8.0.2(@types/node@20.17.10)(graphql@16.9.0)
       '@graphql-tools/utils': 10.5.4(graphql@16.9.0)
       '@whatwg-node/fetch': 0.8.8
       chalk: 4.1.2
-      cosmiconfig: 8.3.6(typescript@5.3.3)
+      cosmiconfig: 8.3.6(typescript@5.7.2)
       debounce: 1.2.1
       detect-indent: 6.1.0
       graphql: 16.9.0
-      graphql-config: 5.1.2(@types/node@18.18.5)(graphql@16.9.0)(typescript@5.3.3)
+      graphql-config: 5.1.2(@types/node@20.17.10)(graphql@16.9.0)(typescript@5.7.2)
       inquirer: 8.2.6
       is-glob: 4.0.3
       jiti: 1.21.6
@@ -3815,7 +3867,7 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@graphql-tools/executor-http@1.1.6(@types/node@18.18.5)(graphql@16.9.0):
+  /@graphql-tools/executor-http@1.1.6(@types/node@20.17.10)(graphql@16.9.0):
     resolution: {integrity: sha512-wGKjJzbi6em8cWI3sry6T7kAgoxMXYNM+KlbsWczPvIsHvv1cqXlrP1lwC6f7Ja1FfWdU1ZIEgOv93ext7IDyQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
@@ -3826,7 +3878,7 @@ packages:
       '@whatwg-node/fetch': 0.9.21
       extract-files: 11.0.0
       graphql: 16.9.0
-      meros: 1.3.0(@types/node@18.18.5)
+      meros: 1.3.0(@types/node@20.17.10)
       tslib: 2.7.0
       value-or-promise: 1.0.12
     transitivePeerDependencies:
@@ -3881,14 +3933,14 @@ packages:
       - supports-color
     dev: true
 
-  /@graphql-tools/github-loader@8.0.1(@types/node@18.18.5)(graphql@16.9.0):
+  /@graphql-tools/github-loader@8.0.1(@types/node@20.17.10)(graphql@16.9.0):
     resolution: {integrity: sha512-W4dFLQJ5GtKGltvh/u1apWRFKBQOsDzFxO9cJkOYZj1VzHCpRF43uLST4VbCfWve+AwBqOuKr7YgkHoxpRMkcg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
       '@ardatan/sync-fetch': 0.0.1
-      '@graphql-tools/executor-http': 1.1.6(@types/node@18.18.5)(graphql@16.9.0)
+      '@graphql-tools/executor-http': 1.1.6(@types/node@20.17.10)(graphql@16.9.0)
       '@graphql-tools/graphql-tag-pluck': 8.3.2(graphql@16.9.0)
       '@graphql-tools/utils': 10.5.4(graphql@16.9.0)
       '@whatwg-node/fetch': 0.9.21
@@ -3992,13 +4044,13 @@ packages:
       tslib: 2.7.0
     dev: true
 
-  /@graphql-tools/prisma-loader@8.0.4(@types/node@18.18.5)(graphql@16.9.0):
+  /@graphql-tools/prisma-loader@8.0.4(@types/node@20.17.10)(graphql@16.9.0):
     resolution: {integrity: sha512-hqKPlw8bOu/GRqtYr0+dINAI13HinTVYBDqhwGAPIFmLr5s+qKskzgCiwbsckdrb5LWVFmVZc+UXn80OGiyBzg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
-      '@graphql-tools/url-loader': 8.0.2(@types/node@18.18.5)(graphql@16.9.0)
+      '@graphql-tools/url-loader': 8.0.2(@types/node@20.17.10)(graphql@16.9.0)
       '@graphql-tools/utils': 10.5.4(graphql@16.9.0)
       '@types/js-yaml': 4.0.9
       '@whatwg-node/fetch': 0.9.21
@@ -4051,7 +4103,7 @@ packages:
       value-or-promise: 1.0.12
     dev: true
 
-  /@graphql-tools/url-loader@8.0.2(@types/node@18.18.5)(graphql@16.9.0):
+  /@graphql-tools/url-loader@8.0.2(@types/node@20.17.10)(graphql@16.9.0):
     resolution: {integrity: sha512-1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
@@ -4060,7 +4112,7 @@ packages:
       '@ardatan/sync-fetch': 0.0.1
       '@graphql-tools/delegate': 10.0.21(graphql@16.9.0)
       '@graphql-tools/executor-graphql-ws': 1.2.0(graphql@16.9.0)
-      '@graphql-tools/executor-http': 1.1.6(@types/node@18.18.5)(graphql@16.9.0)
+      '@graphql-tools/executor-http': 1.1.6(@types/node@20.17.10)(graphql@16.9.0)
       '@graphql-tools/executor-legacy-ws': 1.1.0(graphql@16.9.0)
       '@graphql-tools/utils': 10.5.4(graphql@16.9.0)
       '@graphql-tools/wrap': 10.0.5(graphql@16.9.0)
@@ -4139,22 +4191,33 @@ packages:
       - encoding
     dev: false
 
-  /@humanwhocodes/config-array@0.11.14:
-    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
-    engines: {node: '>=10.10.0'}
+  /@humanfs/core@0.19.1:
+    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
+    engines: {node: '>=18.18.0'}
+    dev: true
+
+  /@humanfs/node@0.16.6:
+    resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==}
+    engines: {node: '>=18.18.0'}
     dependencies:
-      '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.7(supports-color@5.5.0)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
+      '@humanfs/core': 0.19.1
+      '@humanwhocodes/retry': 0.3.1
+    dev: true
 
   /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
+    dev: true
 
-  /@humanwhocodes/object-schema@2.0.2:
-    resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
+  /@humanwhocodes/retry@0.3.1:
+    resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==}
+    engines: {node: '>=18.18'}
+    dev: true
+
+  /@humanwhocodes/retry@0.4.1:
+    resolution: {integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==}
+    engines: {node: '>=18.18'}
+    dev: true
 
   /@img/sharp-darwin-arm64@0.33.4:
     resolution: {integrity: sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA==}
@@ -4344,23 +4407,23 @@ packages:
     dev: true
     optional: true
 
-  /@inquirer/confirm@5.0.2(@types/node@18.18.5):
+  /@inquirer/confirm@5.0.2(@types/node@20.17.10):
     resolution: {integrity: sha512-KJLUHOaKnNCYzwVbryj3TNBxyZIrr56fR5N45v6K9IPrbT6B7DcudBMfylkV1A8PUdJE15mybkEQyp2/ZUpxUA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
     dependencies:
-      '@inquirer/core': 10.1.0(@types/node@18.18.5)
-      '@inquirer/type': 3.0.1(@types/node@18.18.5)
-      '@types/node': 18.18.5
+      '@inquirer/core': 10.1.0(@types/node@20.17.10)
+      '@inquirer/type': 3.0.1(@types/node@20.17.10)
+      '@types/node': 20.17.10
     dev: true
 
-  /@inquirer/core@10.1.0(@types/node@18.18.5):
+  /@inquirer/core@10.1.0(@types/node@20.17.10):
     resolution: {integrity: sha512-I+ETk2AL+yAVbvuKx5AJpQmoaWhpiTFOg/UJb7ZkMAK4blmtG8ATh5ct+T/8xNld0CZG/2UhtkdMwpgvld92XQ==}
     engines: {node: '>=18'}
     dependencies:
       '@inquirer/figures': 1.0.8
-      '@inquirer/type': 3.0.1(@types/node@18.18.5)
+      '@inquirer/type': 3.0.1(@types/node@20.17.10)
       ansi-escapes: 4.3.2
       cli-width: 4.1.0
       mute-stream: 2.0.0
@@ -4377,13 +4440,13 @@ packages:
     engines: {node: '>=18'}
     dev: true
 
-  /@inquirer/type@3.0.1(@types/node@18.18.5):
+  /@inquirer/type@3.0.1(@types/node@20.17.10):
     resolution: {integrity: sha512-+ksJMIy92sOAiAccGpcKZUc3bYO07cADnscIxHBknEm3uNts3movSmBofc1908BNy5edKscxYeAdaX1NXkHS6A==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: true
 
   /@isaacs/cliui@8.0.2:
@@ -4419,7 +4482,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       chalk: 4.1.2
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -4440,14 +4503,14 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.9.0
       exit: 0.1.2
       graceful-fs: 4.2.11
       jest-changed-files: 29.7.0
-      jest-config: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+      jest-config: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -4475,7 +4538,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       jest-mock: 29.7.0
 
   /@jest/expect-utils@29.7.0:
@@ -4500,7 +4563,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -4532,7 +4595,7 @@ packages:
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.25
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       chalk: 4.1.2
       collect-v8-coverage: 1.0.2
       exit: 0.1.2
@@ -4619,7 +4682,7 @@ packages:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.6
       '@types/istanbul-reports': 3.0.4
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       '@types/yargs': 17.0.32
       chalk: 4.1.2
 
@@ -5093,10 +5156,17 @@ packages:
   /@next/env@14.2.18:
     resolution: {integrity: sha512-2vWLOUwIPgoqMJKG6dt35fVXVhgM09tw4tK3/Q34GFXDrfiHlG7iS33VA4ggnjWxjiz9KV5xzfsQzJX6vGAekA==}
 
-  /@next/eslint-plugin-next@15.0.1:
-    resolution: {integrity: sha512-bKWsMaGPbiFAaGqrDJvbE8b4Z0uKicGVcgOI77YM2ui3UfjHMr4emFPrZTLeZVchi7fT1mooG2LxREfUUClIKw==}
+  /@next/eslint-plugin-next@15.0.3:
+    resolution: {integrity: sha512-3Ln/nHq2V+v8uIaxCR6YfYo7ceRgZNXfTd3yW1ukTaFbO+/I8jNakrjYWODvG9BuR2v5kgVtH/C8r0i11quOgw==}
+    dependencies:
+      fast-glob: 3.3.1
+    dev: true
+
+  /@next/eslint-plugin-next@15.1.1:
+    resolution: {integrity: sha512-yACipsS2HI9ktcfz/1UsO0/sDbVjXWKDE/fzzMLnYES+K4KJyqHChyBQeaxiK7/NDnxrdk7Ow2i9LRm3ZTAWow==}
     dependencies:
       fast-glob: 3.3.1
+    dev: true
 
   /@next/swc-darwin-arm64@14.2.18:
     resolution: {integrity: sha512-tOBlDHCjGdyLf0ube/rDUs6VtwNOajaWV+5FV/ajPgrvHeisllEdymY/oDgv2cx561+gJksfMUtqf8crug7sbA==}
@@ -5876,6 +5946,7 @@ packages:
       picocolors: 1.0.1
       tiny-glob: 0.2.9
       tslib: 2.7.0
+    dev: true
 
   /@playwright/test@1.47.2:
     resolution: {integrity: sha512-jTXRsoSPONAs8Za9QEQdyjFn+0ZQFjCiIztAIF6bi1HqhBzG9Ma7g1WotyiGqFSBRZjIEqMdT8RUlbk1QVhzCQ==}
@@ -6081,8 +6152,8 @@ packages:
       '@prisma/fetch-engine': 5.16.1
       '@prisma/get-platform': 5.16.1
 
-  /@prisma/extension-accelerate@1.0.0(@prisma/client@5.16.1):
-    resolution: {integrity: sha512-5oSpPtKCMfTl/sSXaS/7vBsPqfm+eEVB6/5KPBJITFatDoFcmjx/PIC/T93mHLiHI98xKwosPN59NGXjDDhcFA==}
+  /@prisma/extension-accelerate@1.2.1(@prisma/client@5.16.1):
+    resolution: {integrity: sha512-QicnMeyqL226ilT3vvRsFAqPeIdqHGKR4c25CoK5zZ1tNIv8egfgpD1gCKqOGmfAz0pIKQnMuJU3eNg9KItC7A==}
     engines: {node: '>=16'}
     peerDependencies:
       '@prisma/client': '>=4.16.1'
@@ -6178,12 +6249,12 @@ packages:
       '@babel/runtime': 7.24.5
     dev: false
 
-  /@radix-ui/primitive@1.1.0:
-    resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==}
+  /@radix-ui/primitive@1.1.1:
+    resolution: {integrity: sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==}
     dev: false
 
-  /@radix-ui/react-accessible-icon@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-i9Zg4NOSXlfUva0agzI2DjWrvFJm9uO4L6CMW7nmMa5CIOOX/Yin894W7WwjodFQWPwe5kmAJ4JF33R8slKI2g==}
+  /@radix-ui/react-accessible-icon@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-DH8vuU7oqHt9RhO3V9Z1b8ek+bOl4+9VLsh0cgL6t7f2WhbuOChm3ft0EmCCsfd4ORi7Cs3II4aNcTXi+bh+wg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6195,7 +6266,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
@@ -6231,8 +6302,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-alert-dialog@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-eGSlLzPhKO+TErxkiGcCZGuvbVMnLA1MTnyBksGOeGRGkxHiiJUujsjmNTdWTm4iHVSRaUao9/4Ur671auMghQ==}
+  /@radix-ui/react-alert-dialog@1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-A6Kh23qZDLy3PSU4bh2UJZznOrUdHImIXqF8YtUa6CN73f8EOO9XlXSCd9IHyPvIquTaa/kwaSWzZTtUvgXVGw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6244,12 +6315,12 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dialog': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-dialog': 1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
@@ -6277,8 +6348,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-arrow@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-FmlW1rCg7hBpEBwFbjHwCW6AmWLQM6g/v0Sn8XbP9NvmSZ2San1FpQeyPtufzOMSIx7Y4dzjlHoifhp+7NkZhw==}
+  /@radix-ui/react-arrow@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6290,15 +6361,15 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-aspect-ratio@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-dP87DM/Y7jFlPgUZTlhx6FF5CEzOiaxp2rBCKlaXlpH5Ip/9Fg5zZ9lDOQ5o/MOfUlf36eak14zoWYpgcgGoOg==}
+  /@radix-ui/react-aspect-ratio@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-kNU4FIpcFMBLkOUcgeIteH06/8JLBcYY6Le1iKenDGCYNYFX3TQqCZjzkOsz37h7r94/99GTb7YhEr98ZBJibw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6310,15 +6381,15 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-avatar@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-eoOtThOmxeoizxpX6RiEsQZ2wj5r4+zoeqAwO0cBaFQGjJwIH3dIX0OCxNrCyrrdxG+vBweMETh3VziQG7c1kw==}
+  /@radix-ui/react-avatar@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-GaC7bXQZ5VgZvVvsJ5mu/AEbjYLnhhkoidOboC50Z6FFlLA03wG2ianUoH+zgDQ31/9gCF59bE4+2bBgTyMiig==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6331,7 +6402,7 @@ packages:
         optional: true
     dependencies:
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
@@ -6340,8 +6411,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-checkbox@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-/i0fl686zaJbDQLNKrkCbMyDm6FQMt4jg323k7HuqitoANm9sE23Ql8yOK3Wusk34HSLKDChhMux05FnP6KUkw==}
+  /@radix-ui/react-checkbox@1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-HD7/ocp8f1B3e6OHygH0n7ZKjONkhciy1Nh0yuBgObqThc3oyx+vuMfFHKAknXRHHWVE9XvXStxJFyjUmB8PIw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6353,11 +6424,11 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-size': 1.1.0(@types/react@18.2.57)(react@18.2.0)
@@ -6419,8 +6490,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-collection@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==}
+  /@radix-ui/react-collection@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-LwT3pSho9Dljg+wY2KN2mrrh6y3qELfftINERIzBUO9e0N+t0oMTyn3k9iv+ZqgrwGkRnLpNJrsMv9BZlt2yuA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6432,10 +6503,10 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
@@ -6456,8 +6527,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-compose-refs@1.1.0(@types/react@18.2.57)(react@18.2.0):
-    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
+  /@radix-ui/react-compose-refs@1.1.1(@types/react@18.2.57)(react@18.2.0):
+    resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -6469,8 +6540,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-context-menu@2.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-99EatSTpW+hRYHt7m8wdDlLtkmTovEe8Z/hnxUPV+SKuuNL5HWNhQI4QSdjZqNSgXHay2z4M3Dym73j9p2Gx5Q==}
+  /@radix-ui/react-context-menu@2.2.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-ap4wdGwK52rJxGkwukU1NrnEodsUFQIooANKu+ey7d6raQ2biTcEf8za1zr0mgFHieevRTB2nK4dJeN8pTAZGQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6482,10 +6553,10 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/primitive': 1.1.1
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-menu': 2.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-menu': 2.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
@@ -6508,19 +6579,6 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-context@1.1.0(@types/react@18.2.57)(react@18.2.0):
-    resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 18.2.57
-      react: 18.2.0
-    dev: false
-
   /@radix-ui/react-context@1.1.1(@types/react@18.2.57)(react@18.2.0):
     resolution: {integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==}
     peerDependencies:
@@ -6534,8 +6592,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-dialog@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Yj4dZtqa2o+kG61fzB0H2qUvmwBA2oyQroGLyNtBj1beo1khoQ3q1a2AO8rrQYjd8256CO9+N8L9tvsS+bnIyA==}
+  /@radix-ui/react-dialog@1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6547,24 +6605,24 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       aria-hidden: 1.2.4
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-remove-scroll: 2.6.0(@types/react@18.2.57)(react@18.2.0)
+      react-remove-scroll: 2.6.2(@types/react@18.2.57)(react@18.2.0)
     dev: false
 
   /@radix-ui/react-direction@1.0.1(@types/react@18.2.57)(react@18.2.0):
@@ -6619,8 +6677,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-dismissable-layer@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==}
+  /@radix-ui/react-dismissable-layer@1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6632,9 +6690,9 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
@@ -6643,8 +6701,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-dropdown-menu@2.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-GVZMR+eqK8/Kes0a36Qrv+i20bAPXSn8rCBTHx30w+3ECnR5o3xixAlqcVaYvLeyKUsm0aqyhWfmUcqufM8nYA==}
+  /@radix-ui/react-dropdown-menu@2.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6656,12 +6714,12 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-menu': 2.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-menu': 2.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
@@ -6682,8 +6740,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-focus-scope@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==}
+  /@radix-ui/react-focus-scope@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-01omzJAYRxXdG2/he/+xy+c8a8gCydoQ1yOxnWNcRhrrBW5W+RQJ22EK1SaO8tb3WoUsuEw7mJjBozPzihDFjA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6695,8 +6753,8 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
@@ -6704,8 +6762,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-form@0.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-1/oVYPDjbFILOLIarcGcMKo+y6SbTVT/iUKVEw59CF4offwZgBgC3ZOeSBewjqU0vdA6FWTPWTN63obj55S/tQ==}
+  /@radix-ui/react-form@0.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Ah2TBvzl2trb4DL9DQtyUJgAUfq/djMN7j5CHzdpbdR3W7OL8N4JcJgE80cXMf3ssCE+8yg0zFQoJ0srxqfsFA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6717,20 +6775,20 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-label': 2.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-label': 2.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-hover-card@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Y5w0qGhysvmqsIy6nQxaPa6mXNKznfoGjOfBgzOjocLxr2XlSjqBMYQQL+FfyogsMuX+m8cZyQGYhJxvxUzO4w==}
+  /@radix-ui/react-hover-card@1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-QSUUnRA3PQ2UhvoCv3eYvMnCAgGQW+sTu86QPuNb+ZMi+ZENd6UWpiXbcWDQ4AEaKF9KKpCHBeaJz9Rw6lRlaQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6742,14 +6800,14 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-popper': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
@@ -6794,8 +6852,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-label@2.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-peLblDlFw/ngk3UWq0VnYaOLy6agTZZ+MUO/WhVfm14vJGML+xH4FAl2XQGLqdefjNb7ApRg6Yn7U42ZhmYXdw==}
+  /@radix-ui/react-label@2.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-UUw5E4e/2+4kFMH7+YxORXGWggtY6sM8WIwh5RZchhLuUg2H1hc98Py+pr8HMz6rdaYrK2t296ZEjYLOCO5uUw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6807,15 +6865,15 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-menu@2.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-lZ0R4qR2Al6fZ4yCCZzu/ReTFrylHFxIqy7OezIpWF4bL0o9biKo0pFIvkaew3TyZ9Fy5gYVrR5zCGZBVbO1zg==}
+  /@radix-ui/react-menu@2.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6827,32 +6885,32 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-collection': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-popper': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       aria-hidden: 1.2.4
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-remove-scroll: 2.6.0(@types/react@18.2.57)(react@18.2.0)
+      react-remove-scroll: 2.6.2(@types/react@18.2.57)(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-popover@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-u2HRUyWW+lOiA2g0Le0tMmT55FGOEWHwPFt1EPfbLly7uXQExFo5duNKqG2DzmFXIdqOeNd+TpE8baHWJCyP9w==}
+  /@radix-ui/react-popover@1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-aUACAkXx8LaFymDma+HQVji7WhvEhpFJ7+qPz17Nf4lLZqtreGOFRiNQWQmhzp7kEWg9cOyyQJpdIMUMPc/CPw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6864,25 +6922,25 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-popper': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       aria-hidden: 1.2.4
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-remove-scroll: 2.6.0(@types/react@18.2.57)(react@18.2.0)
+      react-remove-scroll: 2.6.2(@types/react@18.2.57)(react@18.2.0)
     dev: false
 
   /@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
@@ -6915,8 +6973,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-popper@1.2.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-ZnRMshKF43aBxVWPWvbj21+7TQCvhuULWJ4gNIKYpRlQt5xGRhLx66tMp8pya2UkGHTSlhpXwmjqltDYHhw7Vg==}
+  /@radix-ui/react-popper@1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6929,10 +6987,10 @@ packages:
         optional: true
     dependencies:
       '@floating-ui/react-dom': 2.0.1(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-arrow': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-arrow': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-rect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
@@ -6965,8 +7023,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-portal@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==}
+  /@radix-ui/react-portal@1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -6978,7 +7036,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
@@ -7008,8 +7066,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-presence@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==}
+  /@radix-ui/react-presence@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7021,7 +7079,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
@@ -7050,8 +7108,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-primitive@2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==}
+  /@radix-ui/react-primitive@2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7063,15 +7121,15 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-radio-group@1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-kdbv54g4vfRjja9DNWPMxKvXblzqbpEC8kspEkZ6dVP7kQksGCn+iZHkcCz2nb00+lPdRvxrqy4WrvvV1cNqrQ==}
+  /@radix-ui/react-radio-group@1.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-E0MLLGfOP0l8P/NxgVzfXJ8w3Ch8cdO6UDzJfDChu4EJDy+/WdO5LqpdY8PYnCErkmZH3gZhDL1K7kQ41fAHuQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7083,13 +7141,13 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-size': 1.1.0(@types/react@18.2.57)(react@18.2.0)
@@ -7099,8 +7157,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-roving-focus@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-EA6AMGeq9AEeQDeSH0aZgG198qkfHSbvWTf1HvoDmOB5bBG/qTxjYMWUKMnYiV6J/iP/J8MEFSuB2zRU2n7ODA==}
+  /@radix-ui/react-roving-focus@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-QE1RoxPGJ/Nm8Qmk0PxP8ojmoaS67i0s7hVssS7KuI2FQoc/uzVlZsqKfQvxPE6D8hICCPHJ4D88zNhT3OOmkw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7112,13 +7170,13 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-collection': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
@@ -7127,8 +7185,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-scroll-area@1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-FnM1fHfCtEZ1JkyfH/1oMiTcFBQvHKl4vD9WnpwkLgtF+UmnXMCad6ECPTaAjcDjam+ndOEJWgHyKDGNteWSHw==}
+  /@radix-ui/react-scroll-area@1.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-EFI1N/S3YxZEW/lJ/H1jY3njlvTd8tBmgKEn4GHi51+aMm94i6NmAJstsm5cu3yJwYqYc93gpCPm21FeAbFk6g==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7141,12 +7199,12 @@ packages:
         optional: true
     dependencies:
       '@radix-ui/number': 1.1.0
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
@@ -7155,8 +7213,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-select@2.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-rZJtWmorC7dFRi0owDmoijm6nSJH1tVw64QGiNIZ9PNLyBDtG+iAq+XGsya052At4BfarzY/Dhv9wrrUr6IMZA==}
+  /@radix-ui/react-select@2.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-pOkb2u8KgO47j/h7AylCj7dJsm69BXcjkrvTqMptFqsE2i0p8lHkfgneXKjAgPzBMivnoMyt8o4KiV4wYzDdyQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7169,34 +7227,34 @@ packages:
         optional: true
     dependencies:
       '@radix-ui/number': 1.1.0
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-collection': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-popper': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       aria-hidden: 1.2.4
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-remove-scroll: 2.6.0(@types/react@18.2.57)(react@18.2.0)
+      react-remove-scroll: 2.6.2(@types/react@18.2.57)(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-separator@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==}
+  /@radix-ui/react-separator@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-RRiNRSrD8iUiXriq/Y5n4/3iE8HzqgLHsusUSg5jVpU2+3tqcUFPJXHDymwEypunc2sWxDUS3UC+rkZRlHedsw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7208,15 +7266,15 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-slider@1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-bEzQoDW0XP+h/oGbutF5VMWJPAl/UU8IJjr7h02SOHDIIIxq+cep8nItVNoBV+OMmahCdqdF38FTpmXoqQUGvw==}
+  /@radix-ui/react-slider@1.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-sNlU06ii1/ZcbHf8I9En54ZPW0Vil/yPVg4vQMcFNjrIx51jsHbFl1HYHQvCIWJSr1q0ZmA+iIs/ZTv8h7HHSA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7229,12 +7287,12 @@ packages:
         optional: true
     dependencies:
       '@radix-ui/number': 1.1.0
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-collection': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.1.0(@types/react@18.2.57)(react@18.2.0)
@@ -7260,8 +7318,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-slot@1.1.0(@types/react@18.2.57)(react@18.2.0):
-    resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
+  /@radix-ui/react-slot@1.1.1(@types/react@18.2.57)(react@18.2.0):
+    resolution: {integrity: sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -7269,13 +7327,13 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       react: 18.2.0
     dev: false
 
-  /@radix-ui/react-switch@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-diPqDDoBcZPSicYoMWdWx+bCPuTRH4QSp9J+65IvtdS0Kuzt67bI6n32vCj8q6NZmYW/ah+2orOtMwcX5eQwIg==}
+  /@radix-ui/react-switch@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-zGukiWHjEdBCRyXvKR6iXAQG6qXm2esuAD6kDOi9Cn+1X6ev3ASo4+CsYaD6Fov9r/AQFekqnD/7+V0Cs6/98g==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7287,10 +7345,10 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-size': 1.1.0(@types/react@18.2.57)(react@18.2.0)
@@ -7300,8 +7358,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-tabs@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-3GBUDmP2DvzmtYLMsHmpA1GtR46ZDZ+OreXM/N+kkQJOPIgytFWWTfDQmBQKBvaFS0Vno0FktdbVzN28KGrMdw==}
+  /@radix-ui/react-tabs@1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-9u/tQJMcC2aGq7KXpGivMm1mgq7oRJKXphDwdypPd/j21j/2znamPU8WkXgnhUaTrSFNIt8XhOyCAupg8/GbwQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7313,13 +7371,13 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/primitive': 1.1.1
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
@@ -7359,8 +7417,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-tooltip@1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-QpObUH/ZlpaO4YgHSaYzrLO2VuO+ZBFFgGzjMUPwtiYnAzzNNDPJeEGRrT7qNOrWm/Jr08M1vlp+vTHtnSQ0Uw==}
+  /@radix-ui/react-tooltip@1.1.6(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-TLB5D8QLExS1uDn7+wH/bjEmRurNMTzNrtq7IjaS4kjion9NtzsTGkvR5+i7yc9q01Pi2KMM2cN3f8UG4IvvXA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7372,18 +7430,18 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-context': 1.1.1(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-id': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-popper': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
@@ -7594,8 +7652,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@radix-ui/react-visually-hidden@1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==}
+  /@radix-ui/react-visually-hidden@1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-vVfA2IZ9q/J+gEamvj761Oq1FpWgCDaNOOIfbPVp2MVPLEomUr5+Vf7kJGwQ24YxZSlQVar7Bes8kyTo5Dshpg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -7607,7 +7665,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       react: 18.2.0
@@ -7638,30 +7696,30 @@ packages:
         optional: true
     dependencies:
       '@radix-ui/colors': 2.0.1
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-accessible-icon': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-alert-dialog': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-aspect-ratio': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-avatar': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-checkbox': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-context-menu': 2.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-dialog': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-accessible-icon': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-alert-dialog': 1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-aspect-ratio': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-avatar': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-checkbox': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-context-menu': 2.2.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dialog': 1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-dropdown-menu': 2.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-form': 0.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-hover-card': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-popover': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-radio-group': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-scroll-area': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-select': 2.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-separator': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slider': 1.2.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.2.57)(react@18.2.0)
-      '@radix-ui/react-switch': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-tabs': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-tooltip': 1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dropdown-menu': 2.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-form': 0.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-hover-card': 1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-popover': 1.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.1.3(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-radio-group': 1.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-scroll-area': 1.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-select': 2.1.4(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-separator': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slider': 1.2.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.2.57)(react@18.2.0)
+      '@radix-ui/react-switch': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-tabs': 1.1.2(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-tooltip': 1.1.6(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.1.1(@types/react-dom@18.2.19)(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.2.57
       '@types/react-dom': 18.2.19
       classnames: 2.3.2
@@ -7708,13 +7766,11 @@ packages:
 
   /@rtsao/scc@1.1.0:
     resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+    dev: true
 
   /@rushstack/eslint-patch@1.10.4:
     resolution: {integrity: sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==}
-
-  /@rushstack/eslint-patch@1.7.2:
-    resolution: {integrity: sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==}
-    dev: false
+    dev: true
 
   /@sanity/client@6.21.3:
     resolution: {integrity: sha512-oE2+4kKRTZhFCc4IIsojkzKF0jIhsSYSRxkPZjScZ1k/EQ3Y2tEcQYiKwvvotzaXoaWsIL3RTpulE+R4iBYiBw==}
@@ -7746,7 +7802,7 @@ packages:
       aggregate-error: 3.1.0
       fs-extra: 11.2.0
       lodash: 4.17.21
-      semantic-release: 21.1.2(typescript@5.3.3)
+      semantic-release: 21.1.2(typescript@5.7.2)
     dev: false
 
   /@semantic-release/commit-analyzer@10.0.4(semantic-release@21.1.2):
@@ -7762,7 +7818,7 @@ packages:
       import-from: 4.0.0
       lodash-es: 4.17.21
       micromatch: 4.0.5
-      semantic-release: 21.1.2(typescript@5.3.3)
+      semantic-release: 21.1.2(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -7789,7 +7845,7 @@ packages:
       execa: 5.1.1
       lodash: 4.17.21
       parse-json: 5.2.0
-      semantic-release: 21.1.2(typescript@5.3.3)
+      semantic-release: 21.1.2(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -7808,7 +7864,7 @@ packages:
       lodash: 4.17.21
       micromatch: 4.0.5
       p-reduce: 2.1.0
-      semantic-release: 21.1.2(typescript@5.3.3)
+      semantic-release: 21.1.2(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -7834,7 +7890,7 @@ packages:
       lodash-es: 4.17.21
       mime: 4.0.3
       p-filter: 4.1.0
-      semantic-release: 21.1.2(typescript@5.3.3)
+      semantic-release: 21.1.2(typescript@5.7.2)
       url-join: 5.0.0
     transitivePeerDependencies:
       - supports-color
@@ -7857,7 +7913,7 @@ packages:
       rc: 1.2.8
       read-pkg: 8.1.0
       registry-auth-token: 5.0.2
-      semantic-release: 21.1.2(typescript@5.3.3)
+      semantic-release: 21.1.2(typescript@5.7.2)
       semver: 7.6.3
       tempy: 3.1.0
     dev: false
@@ -7878,7 +7934,7 @@ packages:
       into-stream: 7.0.0
       lodash-es: 4.17.21
       read-pkg-up: 10.1.0
-      semantic-release: 21.1.2(typescript@5.3.3)
+      semantic-release: 21.1.2(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -8355,7 +8411,7 @@ packages:
     resolution: {integrity: sha512-Wz7QYfPAlG/DR+DfABddUZeNgoeY7d1J39OCR2jR+v7VBsB8ezulDK5szTnDDPDwLH5IWhLvXIHlCFZV7MSKgA==}
     engines: {node: '>= 18', npm: '>= 8.6.0'}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: false
 
   /@slack/types@2.12.0:
@@ -8369,7 +8425,7 @@ packages:
     dependencies:
       '@slack/logger': 4.0.0
       '@slack/types': 2.12.0
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       '@types/retry': 0.12.0
       axios: 1.6.8
       eventemitter3: 5.0.1
@@ -8396,7 +8452,7 @@ packages:
       '@types/uuid': 9.0.3
       dequal: 2.0.3
       polished: 4.3.1
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       uuid: 9.0.1
     dev: true
 
@@ -8407,7 +8463,7 @@ packages:
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     dev: true
 
@@ -8418,7 +8474,7 @@ packages:
     dependencies:
       '@storybook/global': 5.0.0
       dequal: 2.0.3
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     dev: true
 
@@ -8433,7 +8489,7 @@ packages:
       '@storybook/react-dom-shim': 8.4.1(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
@@ -8453,7 +8509,7 @@ packages:
       '@storybook/addon-outline': 8.4.1(storybook@8.4.1)
       '@storybook/addon-toolbars': 8.4.1(storybook@8.4.1)
       '@storybook/addon-viewport': 8.4.1(storybook@8.4.1)
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
@@ -8465,7 +8521,7 @@ packages:
       storybook: ^8.4.1
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
   /@storybook/addon-interactions@8.4.1(storybook@8.4.1):
@@ -8477,7 +8533,7 @@ packages:
       '@storybook/instrumenter': 8.4.1(storybook@8.4.1)
       '@storybook/test': 8.4.1(storybook@8.4.1)
       polished: 4.3.1
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     dev: true
 
@@ -8493,7 +8549,7 @@ packages:
       '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
       react: 18.2.0
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     dev: true
 
@@ -8503,7 +8559,7 @@ packages:
       storybook: ^8.4.1
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       tiny-invariant: 1.3.3
     dev: true
 
@@ -8513,7 +8569,7 @@ packages:
       storybook: ^8.4.1
     dependencies:
       react-confetti: 6.1.0(react@18.2.0)
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     transitivePeerDependencies:
       - react
     dev: true
@@ -8524,7 +8580,7 @@ packages:
       storybook: ^8.4.1
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     dev: true
 
@@ -8533,7 +8589,7 @@ packages:
     peerDependencies:
       storybook: ^8.4.1
     dependencies:
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
   /@storybook/addon-viewport@8.4.1(storybook@8.4.1):
@@ -8542,7 +8598,7 @@ packages:
       storybook: ^8.4.1
     dependencies:
       memoizerific: 1.11.3
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
   /@storybook/blocks@8.4.1(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1):
@@ -8561,11 +8617,11 @@ packages:
       '@storybook/icons': 1.2.12(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/builder-webpack5@8.4.1(esbuild@0.21.5)(storybook@8.4.1)(typescript@5.3.3):
+  /@storybook/builder-webpack5@8.4.1(esbuild@0.21.5)(storybook@8.4.1)(typescript@5.7.2):
     resolution: {integrity: sha512-rqSJcxcYiQyceNFSrT9qnI6hrW4/petb1n+oN8nG5HrRsl0zxOVzamMVyNzZxrAMKvq+VMJtLe1rQi8FnJNunw==}
     peerDependencies:
       storybook: ^8.4.1
@@ -8583,17 +8639,17 @@ packages:
       constants-browserify: 1.0.0
       css-loader: 6.11.0(webpack@5.93.0)
       es-module-lexer: 1.5.4
-      fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.3.3)(webpack@5.93.0)
+      fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.7.2)(webpack@5.93.0)
       html-webpack-plugin: 5.6.0(webpack@5.93.0)
       magic-string: 0.30.10
       path-browserify: 1.0.1
       process: 0.11.10
       semver: 7.6.3
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       style-loader: 3.3.4(webpack@5.93.0)
       terser-webpack-plugin: 5.3.10(esbuild@0.21.5)(webpack@5.93.0)
       ts-dedent: 2.2.0
-      typescript: 5.3.3
+      typescript: 5.7.2
       url: 0.11.4
       util: 0.12.5
       util-deprecate: 1.0.2
@@ -8614,7 +8670,7 @@ packages:
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
     dependencies:
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
   /@storybook/core-webpack@8.4.1(storybook@8.4.1):
@@ -8623,11 +8679,11 @@ packages:
       storybook: ^8.4.1
     dependencies:
       '@types/node': 22.8.7
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/core@8.4.1(prettier@3.3.3):
+  /@storybook/core@8.4.1(prettier@3.4.2):
     resolution: {integrity: sha512-q3Q4OFBj7MHHbIFYk/Beejlqv5j7CC3+VWhGcr0TK3SGvdCIZ7EliYuc5JIOgDlEPsnTIk+lkgWI4LAA9mLzSw==}
     peerDependencies:
       prettier: ^2 || ^3
@@ -8641,7 +8697,7 @@ packages:
       esbuild: 0.21.5
       esbuild-register: 3.6.0(esbuild@0.21.5)
       jsdoc-type-pratt-parser: 4.1.0
-      prettier: 3.3.3
+      prettier: 3.4.2
       process: 0.11.10
       recast: 0.23.9
       semver: 7.6.3
@@ -8657,16 +8713,10 @@ packages:
     peerDependencies:
       storybook: ^8.4.1
     dependencies:
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       unplugin: 1.12.0
     dev: true
 
-  /@storybook/csf@0.0.1:
-    resolution: {integrity: sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==}
-    dependencies:
-      lodash: 4.17.21
-    dev: true
-
   /@storybook/csf@0.1.11:
     resolution: {integrity: sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==}
     dependencies:
@@ -8694,7 +8744,7 @@ packages:
     dependencies:
       '@storybook/global': 5.0.0
       '@vitest/utils': 2.1.4
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
   /@storybook/manager-api@8.4.1(storybook@8.4.1):
@@ -8702,10 +8752,10 @@ packages:
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
     dependencies:
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
-  /@storybook/nextjs@8.4.1(esbuild@0.21.5)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3)(webpack@5.93.0):
+  /@storybook/nextjs@8.4.1(esbuild@0.21.5)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2)(webpack@5.93.0):
     resolution: {integrity: sha512-SOEI8qOY+yLsRsvjokSevqtA+E+cXHDBObwPUJKmRxIAEwbP1uJEFnbvpZULs1pQl1gYsZQxEndbkTmM5pwtoQ==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
@@ -8735,9 +8785,9 @@ packages:
       '@babel/preset-typescript': 7.24.7(@babel/core@7.24.5)
       '@babel/runtime': 7.24.5
       '@pmmmwh/react-refresh-webpack-plugin': 0.5.15(react-refresh@0.14.2)(webpack@5.93.0)
-      '@storybook/builder-webpack5': 8.4.1(esbuild@0.21.5)(storybook@8.4.1)(typescript@5.3.3)
-      '@storybook/preset-react-webpack': 8.4.1(@storybook/test@8.4.1)(esbuild@0.21.5)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3)
-      '@storybook/react': 8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3)
+      '@storybook/builder-webpack5': 8.4.1(esbuild@0.21.5)(storybook@8.4.1)(typescript@5.7.2)
+      '@storybook/preset-react-webpack': 8.4.1(@storybook/test@8.4.1)(esbuild@0.21.5)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2)
+      '@storybook/react': 8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2)
       '@storybook/test': 8.4.1(storybook@8.4.1)
       '@types/node': 22.8.7
       '@types/semver': 7.5.0
@@ -8748,22 +8798,22 @@ packages:
       loader-utils: 3.3.1
       next: 14.2.18(@babel/core@7.24.5)(@opentelemetry/api@1.9.0)(@playwright/test@1.47.2)(react-dom@18.2.0)(react@18.2.0)
       node-polyfill-webpack-plugin: 2.0.1(webpack@5.93.0)
-      pnp-webpack-plugin: 1.7.0(typescript@5.3.3)
+      pnp-webpack-plugin: 1.7.0(typescript@5.7.2)
       postcss: 8.4.38
-      postcss-loader: 8.1.1(postcss@8.4.38)(typescript@5.3.3)(webpack@5.93.0)
+      postcss-loader: 8.1.1(postcss@8.4.38)(typescript@5.7.2)(webpack@5.93.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-refresh: 0.14.2
       resolve-url-loader: 5.0.0
       sass-loader: 13.3.3(webpack@5.93.0)
       semver: 7.6.3
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       style-loader: 3.3.4(webpack@5.93.0)
       styled-jsx: 5.1.6(@babel/core@7.24.5)(react@18.2.0)
       ts-dedent: 2.2.0
       tsconfig-paths: 4.2.0
       tsconfig-paths-webpack-plugin: 4.1.0
-      typescript: 5.3.3
+      typescript: 5.7.2
       webpack: 5.93.0(esbuild@0.21.5)
     optionalDependencies:
       sharp: 0.33.4
@@ -8787,7 +8837,7 @@ packages:
       - webpack-plugin-serve
     dev: true
 
-  /@storybook/preset-react-webpack@8.4.1(@storybook/test@8.4.1)(esbuild@0.21.5)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3):
+  /@storybook/preset-react-webpack@8.4.1(@storybook/test@8.4.1)(esbuild@0.21.5)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2):
     resolution: {integrity: sha512-Cm+u3/avHdoneEFHnvFRMPAElWtxyyOkcVsWHkM0rVhj7bxkzOyrBrenm1GiB8NamRosumsEnhREYFo2lthU2A==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
@@ -8800,8 +8850,8 @@ packages:
         optional: true
     dependencies:
       '@storybook/core-webpack': 8.4.1(storybook@8.4.1)
-      '@storybook/react': 8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3)
-      '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0(typescript@5.3.3)(webpack@5.93.0)
+      '@storybook/react': 8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2)
+      '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0(typescript@5.7.2)(webpack@5.93.0)
       '@types/node': 22.8.7
       '@types/semver': 7.5.0
       find-up: 5.0.0
@@ -8811,9 +8861,9 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
       resolve: 1.22.8
       semver: 7.6.3
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
       tsconfig-paths: 4.2.0
-      typescript: 5.3.3
+      typescript: 5.7.2
       webpack: 5.93.0(esbuild@0.21.5)
     transitivePeerDependencies:
       - '@storybook/test'
@@ -8829,10 +8879,10 @@ packages:
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
     dependencies:
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
-  /@storybook/react-docgen-typescript-plugin@1.0.6--canary.9.0c3f3b7.0(typescript@5.3.3)(webpack@5.93.0):
+  /@storybook/react-docgen-typescript-plugin@1.0.6--canary.9.0c3f3b7.0(typescript@5.7.2)(webpack@5.93.0):
     resolution: {integrity: sha512-KUqXC3oa9JuQ0kZJLBhVdS4lOneKTOopnNBK4tUAgoxWQ3u/IjzdueZjFr7gyBrXMoU6duutk3RQR9u8ZpYJ4Q==}
     peerDependencies:
       typescript: '>= 4.x'
@@ -8843,9 +8893,9 @@ packages:
       find-cache-dir: 3.3.2
       flat-cache: 3.0.4
       micromatch: 4.0.5
-      react-docgen-typescript: 2.2.2(typescript@5.3.3)
+      react-docgen-typescript: 2.2.2(typescript@5.7.2)
       tslib: 2.7.0
-      typescript: 5.3.3
+      typescript: 5.7.2
       webpack: 5.93.0(esbuild@0.21.5)
     transitivePeerDependencies:
       - supports-color
@@ -8860,10 +8910,10 @@ packages:
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
-  /@storybook/react@8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.3.3):
+  /@storybook/react@8.4.1(@storybook/test@8.4.1)(react-dom@18.2.0)(react@18.2.0)(storybook@8.4.1)(typescript@5.7.2):
     resolution: {integrity: sha512-ZwszrzV47nWQEZ0X4LyNgv5OFq4iy/7LpmxW6IncIO7PWm70OWG2BVtKFNsNQx0LY+hOtllWZbvg06mPQzahFA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
@@ -8887,8 +8937,8 @@ packages:
       '@storybook/theming': 8.4.1(storybook@8.4.1)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.4.1(prettier@3.3.3)
-      typescript: 5.3.3
+      storybook: 8.4.1(prettier@3.4.2)
+      typescript: 5.7.2
     dev: true
 
   /@storybook/test@8.4.1(storybook@8.4.1):
@@ -8904,7 +8954,7 @@ packages:
       '@testing-library/user-event': 14.5.2(@testing-library/dom@10.4.0)
       '@vitest/expect': 2.0.5
       '@vitest/spy': 2.0.5
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
   /@storybook/theming@8.4.1(storybook@8.4.1):
@@ -8912,7 +8962,7 @@ packages:
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
     dependencies:
-      storybook: 8.4.1(prettier@3.3.3)
+      storybook: 8.4.1(prettier@3.4.2)
     dev: true
 
   /@swc/counter@0.1.3:
@@ -9041,7 +9091,7 @@ packages:
     engines: {node: '>= 10'}
     dev: false
 
-  /@trivago/prettier-plugin-sort-imports@4.3.0(prettier@3.2.5):
+  /@trivago/prettier-plugin-sort-imports@4.3.0(prettier@3.4.2):
     resolution: {integrity: sha512-r3n0onD3BTOVUNPhR4lhVK4/pABGpbA7bW3eumZnYdKaHkf1qEC+Mag6DPbGNuuh0eG8AaYj+YqmVHSiGslaTQ==}
     peerDependencies:
       '@vue/compiler-sfc': 3.x
@@ -9056,10 +9106,10 @@ packages:
       '@babel/types': 7.17.0
       javascript-natural-sort: 0.7.1
       lodash: 4.17.21
-      prettier: 3.2.5
+      prettier: 3.4.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
+    dev: true
 
   /@trpc/client@10.45.2(@trpc/server@10.45.2):
     resolution: {integrity: sha512-ykALM5kYWTLn1zYuUOZ2cPWlVfrXhc18HzBDyRhoPYN0jey4iQHEFSEowfnhg1RvYnrAVjNBgHNeSAXjrDbGwg==}
@@ -9112,7 +9162,7 @@ packages:
   /@ts-morph/common@0.12.3:
     resolution: {integrity: sha512-4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w==}
     dependencies:
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       minimatch: 3.1.2
       mkdirp: 1.0.4
       path-browserify: 1.0.1
@@ -9165,7 +9215,7 @@ packages:
   /@types/buffer-from@1.1.3:
     resolution: {integrity: sha512-2lq4YC9uLUMGHkl2IDtX4tCXSo2+hwMpOJcY1qiIk1kybc31rIlPyM1HCVJhkPFIo75a/pOVxqyvwuf5TpCG/w==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: false
 
   /@types/caseless@0.12.5:
@@ -9179,7 +9229,7 @@ packages:
   /@types/connect@3.4.36:
     resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: false
 
   /@types/cookie@0.6.0:
@@ -9189,7 +9239,7 @@ packages:
   /@types/cross-spawn@6.0.2:
     resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: true
 
   /@types/debug@4.1.12:
@@ -9212,6 +9262,10 @@ packages:
     resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==}
     dev: true
 
+  /@types/eslint-config-prettier@6.11.3:
+    resolution: {integrity: sha512-3wXCiM8croUnhg9LdtZUJQwNcQYGWxxdOWDjPe1ykCqJFPVpzAKfs/2dgSoCtAvdPeaponcWPI7mPcGGp9dkKQ==}
+    dev: true
+
   /@types/eslint-scope@3.7.7:
     resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
     dependencies:
@@ -9227,6 +9281,10 @@ packages:
   /@types/estree@1.0.5:
     resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
 
+  /@types/estree@1.0.6:
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
+    dev: true
+
   /@types/event-source-polyfill@1.0.5:
     resolution: {integrity: sha512-iaiDuDI2aIFft7XkcwMzDWLqo7LVDixd2sR6B4wxJut9xcp/Ev9bO4EFg4rm6S9QxATLBj5OPxdeocgmhjwKaw==}
     dev: false
@@ -9242,13 +9300,13 @@ packages:
   /@types/follow-redirects@1.14.4:
     resolution: {integrity: sha512-GWXfsD0Jc1RWiFmMuMFCpXMzi9L7oPDVwxUnZdg89kDNnqsRfUKXEtUYtA98A6lig1WXH/CYY/fvPW9HuN5fTA==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: false
 
   /@types/graceful-fs@4.1.9:
     resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: true
 
   /@types/hast@2.3.10:
@@ -9290,18 +9348,11 @@ packages:
     dependencies:
       '@types/istanbul-lib-report': 3.0.3
 
-  /@types/jest@29.5.12:
-    resolution: {integrity: sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==}
-    dependencies:
-      expect: 29.7.0
-      pretty-format: 29.7.0
-
   /@types/jest@29.5.14:
     resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==}
     dependencies:
       expect: 29.7.0
       pretty-format: 29.7.0
-    dev: true
 
   /@types/js-yaml@4.0.9:
     resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
@@ -9310,7 +9361,7 @@ packages:
   /@types/jsdom@20.0.1:
     resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       '@types/tough-cookie': 4.0.5
       parse5: 7.1.2
     dev: false
@@ -9318,12 +9369,17 @@ packages:
   /@types/json-schema@7.0.13:
     resolution: {integrity: sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==}
 
+  /@types/json-schema@7.0.15:
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+    dev: true
+
   /@types/json-stringify-safe@5.0.3:
     resolution: {integrity: sha512-oNOjRxLfPeYbBSQ60maucaFNqbslVOPU4WWs5t/sHvAh6tyo/CThXSG+E24tEzkgh/fzvxyDrYdOJufgeNy1sQ==}
     dev: false
 
   /@types/json5@0.0.29:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+    dev: true
 
   /@types/lodash.clonedeep@4.5.9:
     resolution: {integrity: sha512-19429mWC+FyaAhOLzsS8kZUsI+/GmBAQ0HFiCPsKGU+7pBXOQWhyrY6xNNDwUSX8SMZMJvuFVMF9O5dQOlQK9Q==}
@@ -9361,13 +9417,13 @@ packages:
   /@types/mysql@2.15.26:
     resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: false
 
   /@types/node-fetch@2.6.4:
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       form-data: 3.0.1
     dev: false
 
@@ -9377,12 +9433,12 @@ packages:
 
   /@types/node@18.18.5:
     resolution: {integrity: sha512-4slmbtwV59ZxitY4ixUZdy1uRLf9eSIvBWPQxNjhHYWEtn0FryfKpyS2cvADYXTayWdKEIsJengncrVvkI4I6A==}
+    dev: false
 
-  /@types/node@20.8.7:
-    resolution: {integrity: sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==}
+  /@types/node@20.17.10:
+    resolution: {integrity: sha512-/jrvh5h6NXhEauFFexRin69nA0uHJ5gwk4iDivp/DeoEua3uwCUto6PC86IpRITBOs4+6i2I56K5x5b6WYGXHA==}
     dependencies:
-      undici-types: 5.25.3
-    dev: false
+      undici-types: 6.19.8
 
   /@types/node@22.8.7:
     resolution: {integrity: sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q==}
@@ -9411,7 +9467,7 @@ packages:
   /@types/pg@8.6.1:
     resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       pg-protocol: 1.6.1
       pg-types: 2.2.0
     dev: false
@@ -9419,7 +9475,7 @@ packages:
   /@types/progress-stream@2.0.5:
     resolution: {integrity: sha512-5YNriuEZkHlFHHepLIaxzq3atGeav1qCTGzB74HKWpo66qjfostF+rHc785YYYHeBytve8ZG3ejg42jEIfXNiQ==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: false
 
   /@types/prop-types@15.7.5:
@@ -9451,7 +9507,7 @@ packages:
     resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==}
     dependencies:
       '@types/caseless': 0.12.5
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       '@types/tough-cookie': 4.0.5
       form-data: 2.5.1
     dev: false
@@ -9478,7 +9534,7 @@ packages:
   /@types/set-cookie-parser@2.4.9:
     resolution: {integrity: sha512-bCorlULvl0xTdjj4BPUHX4cqs9I+go2TfW/7Do1nnFYWS0CPP429Qr1AY42kiFhCwLpvAkWFr1XIBHd8j6/MCQ==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: true
 
   /@types/shimmer@1.2.0:
@@ -9521,7 +9577,7 @@ packages:
   /@types/ws@8.5.12:
     resolution: {integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: true
 
   /@types/yargs-parser@21.0.3:
@@ -9532,58 +9588,46 @@ packages:
     dependencies:
       '@types/yargs-parser': 21.0.3
 
-  /@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0)(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==}
-    engines: {node: ^18.18.0 || >=20.0.0}
+  /@typescript-eslint/eslint-plugin@8.18.1(@typescript-eslint/parser@8.18.1)(eslint@9.17.0)(typescript@5.7.2):
+    resolution: {integrity: sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^7.0.0
-      eslint: ^8.56.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+      '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
+      eslint: ^8.57.0 || ^9.0.0
+      typescript: '>=4.8.4 <5.8.0'
     dependencies:
       '@eslint-community/regexpp': 4.11.0
-      '@typescript-eslint/parser': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/scope-manager': 7.18.0
-      '@typescript-eslint/type-utils': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 7.18.0
-      eslint: 8.56.0
+      '@typescript-eslint/parser': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
+      '@typescript-eslint/scope-manager': 8.18.1
+      '@typescript-eslint/type-utils': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
+      '@typescript-eslint/utils': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
+      '@typescript-eslint/visitor-keys': 8.18.1
+      eslint: 9.17.0
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.3.3)
-      typescript: 5.3.3
+      ts-api-utils: 1.3.0(typescript@5.7.2)
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /@typescript-eslint/parser@7.18.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==}
-    engines: {node: ^18.18.0 || >=20.0.0}
+  /@typescript-eslint/parser@8.18.1(eslint@9.17.0)(typescript@5.7.2):
+    resolution: {integrity: sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.56.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+      eslint: ^8.57.0 || ^9.0.0
+      typescript: '>=4.8.4 <5.8.0'
     dependencies:
-      '@typescript-eslint/scope-manager': 7.18.0
-      '@typescript-eslint/types': 7.18.0
-      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 7.18.0
-      debug: 4.3.5
-      eslint: 8.56.0
-      typescript: 5.3.3
+      '@typescript-eslint/scope-manager': 8.18.1
+      '@typescript-eslint/types': 8.18.1
+      '@typescript-eslint/typescript-estree': 8.18.1(typescript@5.7.2)
+      '@typescript-eslint/visitor-keys': 8.18.1
+      debug: 4.3.7(supports-color@5.5.0)
+      eslint: 9.17.0
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
-
-  /@typescript-eslint/scope-manager@5.62.0:
-    resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/visitor-keys': 5.62.0
     dev: true
 
   /@typescript-eslint/scope-manager@7.18.0:
@@ -9592,57 +9636,44 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
+    dev: true
 
-  /@typescript-eslint/type-utils@7.18.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==}
-    engines: {node: ^18.18.0 || >=20.0.0}
+  /@typescript-eslint/scope-manager@8.18.1:
+    resolution: {integrity: sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dependencies:
+      '@typescript-eslint/types': 8.18.1
+      '@typescript-eslint/visitor-keys': 8.18.1
+    dev: true
+
+  /@typescript-eslint/type-utils@8.18.1(eslint@9.17.0)(typescript@5.7.2):
+    resolution: {integrity: sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.56.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+      eslint: ^8.57.0 || ^9.0.0
+      typescript: '>=4.8.4 <5.8.0'
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/typescript-estree': 8.18.1(typescript@5.7.2)
+      '@typescript-eslint/utils': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
       debug: 4.3.7(supports-color@5.5.0)
-      eslint: 8.56.0
-      ts-api-utils: 1.3.0(typescript@5.3.3)
-      typescript: 5.3.3
+      eslint: 9.17.0
+      ts-api-utils: 1.3.0(typescript@5.7.2)
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
-
-  /@typescript-eslint/types@5.62.0:
-    resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.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: true
 
-  /@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.3):
-    resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/visitor-keys': 5.62.0
-      debug: 4.3.7(supports-color@5.5.0)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.6.3
-      tsutils: 3.21.0(typescript@5.3.3)
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
+  /@typescript-eslint/types@8.18.1:
+    resolution: {integrity: sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree@7.18.0(typescript@5.3.3):
+  /@typescript-eslint/typescript-estree@7.18.0(typescript@5.7.2):
     resolution: {integrity: sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
@@ -9653,57 +9684,67 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
-      debug: 4.3.5
+      debug: 4.3.7(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.6.2
-      ts-api-utils: 1.3.0(typescript@5.3.3)
-      typescript: 5.3.3
+      semver: 7.6.3
+      ts-api-utils: 1.3.0(typescript@5.7.2)
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/typescript-estree@8.18.1(typescript@5.7.2):
+    resolution: {integrity: sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '>=4.8.4 <5.8.0'
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
-      '@types/json-schema': 7.0.13
-      '@types/semver': 7.5.0
-      '@typescript-eslint/scope-manager': 5.62.0
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
-      eslint: 8.56.0
-      eslint-scope: 5.1.1
-      semver: 7.6.2
+      '@typescript-eslint/types': 8.18.1
+      '@typescript-eslint/visitor-keys': 8.18.1
+      debug: 4.3.7(supports-color@5.5.0)
+      fast-glob: 3.3.2
+      is-glob: 4.0.3
+      minimatch: 9.0.5
+      semver: 7.6.3
+      ts-api-utils: 1.3.0(typescript@5.7.2)
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
-      - typescript
     dev: true
 
-  /@typescript-eslint/utils@7.18.0(eslint@8.56.0)(typescript@5.3.3):
+  /@typescript-eslint/utils@7.18.0(eslint@9.17.0)(typescript@5.7.2):
     resolution: {integrity: sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.17.0)
       '@typescript-eslint/scope-manager': 7.18.0
       '@typescript-eslint/types': 7.18.0
-      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.3.3)
-      eslint: 8.56.0
+      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.7.2)
+      eslint: 9.17.0
     transitivePeerDependencies:
       - supports-color
       - typescript
+    dev: true
 
-  /@typescript-eslint/visitor-keys@5.62.0:
-    resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/utils@8.18.1(eslint@9.17.0)(typescript@5.7.2):
+    resolution: {integrity: sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0
+      typescript: '>=4.8.4 <5.8.0'
     dependencies:
-      '@typescript-eslint/types': 5.62.0
-      eslint-visitor-keys: 3.4.3
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.17.0)
+      '@typescript-eslint/scope-manager': 8.18.1
+      '@typescript-eslint/types': 8.18.1
+      '@typescript-eslint/typescript-estree': 8.18.1(typescript@5.7.2)
+      eslint: 9.17.0
+      typescript: 5.7.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /@typescript-eslint/visitor-keys@7.18.0:
@@ -9712,6 +9753,15 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.18.0
       eslint-visitor-keys: 3.4.3
+    dev: true
+
+  /@typescript-eslint/visitor-keys@8.18.1:
+    resolution: {integrity: sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dependencies:
+      '@typescript-eslint/types': 8.18.1
+      eslint-visitor-keys: 4.2.0
+    dev: true
 
   /@uidotdev/usehooks@2.4.1(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-1I+RwWyS+kdv3Mv0Vmc+p0dPYH0DTRAo04HLyXReYBL9AeseDWUJyi4THuksBJcu9F0Pih69Ak150VDnqbVnXg==}
@@ -9726,6 +9776,7 @@ packages:
 
   /@ungap/structured-clone@1.2.0:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+    dev: false
 
   /@upstash/core-analytics@0.0.10:
     resolution: {integrity: sha512-7qJHGxpQgQr9/vmeS1PktEwvNAF7TI4iJDi8Pu2CFZ9YUGHZH4fOP5TfYlZ4aVxfopnELiE4BS4FBjyK7V1/xQ==}
@@ -9891,7 +9942,7 @@ packages:
     dependencies:
       '@vue/compiler-ssr': 3.4.26
       '@vue/shared': 3.4.26
-      vue: 3.4.26(typescript@5.3.3)
+      vue: 3.4.26(typescript@5.7.2)
     dev: false
 
   /@vue/shared@3.4.26:
@@ -10077,17 +10128,35 @@ packages:
     dependencies:
       acorn: 8.12.1
 
-  /acorn-jsx@5.3.2(acorn@8.11.3):
+  /acorn-jsx-walk@2.0.0:
+    resolution: {integrity: sha512-uuo6iJj4D4ygkdzd6jPtcxs8vZgDX9YFIkqczGImoypX2fQ4dVImmu3UzA4ynixCIMTrEOWW+95M2HuBaCEOVA==}
+    dev: false
+
+  /acorn-jsx@5.3.2(acorn@8.14.0):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.11.3
+      acorn: 8.14.0
+
+  /acorn-loose@8.4.0:
+    resolution: {integrity: sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==}
+    engines: {node: '>=0.4.0'}
+    dependencies:
+      acorn: 8.14.0
+    dev: false
 
   /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
 
+  /acorn-walk@8.3.4:
+    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
+    engines: {node: '>=0.4.0'}
+    dependencies:
+      acorn: 8.14.0
+    dev: false
+
   /acorn@8.11.3:
     resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==}
     engines: {node: '>=0.4.0'}
@@ -10098,6 +10167,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  /acorn@8.14.0:
+    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   /add-filename-increment@1.0.0:
     resolution: {integrity: sha512-pFV8VZX8jxuVMIycKvGZkWF/ihnUubu9lbQVnOnZWp7noVxbKQTNj7zG2y9fXdPcuZ6lAN3Drr517HaivGCjdQ==}
     engines: {node: '>=8'}
@@ -10118,6 +10192,11 @@ packages:
     engines: {node: '>=6.0'}
     dev: true
 
+  /adm-zip@0.5.12:
+    resolution: {integrity: sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==}
+    engines: {node: '>=6.0'}
+    dev: false
+
   /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
@@ -10243,7 +10322,6 @@ packages:
       fast-uri: 3.0.1
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
-    dev: true
 
   /american-british-english-translator@0.2.1:
     resolution: {integrity: sha512-G+RQd2Hn4cfsVrA0QRGOZYp4LgU5SIMTNBOWXI2FKMFljixGbMcO7oAXjwRZfzJ0iJJbAeLEGNwpTH4xSbQpLA==}
@@ -10439,6 +10517,7 @@ packages:
       es-object-atoms: 1.0.0
       get-intrinsic: 1.2.4
       is-string: 1.0.7
+    dev: true
 
   /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
@@ -10454,6 +10533,7 @@ packages:
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       es-shim-unscopables: 1.0.2
+    dev: true
 
   /array.prototype.findlastindex@1.2.5:
     resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
@@ -10465,6 +10545,7 @@ packages:
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       es-shim-unscopables: 1.0.2
+    dev: true
 
   /array.prototype.flat@1.3.2:
     resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
@@ -10472,8 +10553,9 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
       es-shim-unscopables: 1.0.2
+    dev: true
 
   /array.prototype.flatmap@1.3.2:
     resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
@@ -10481,8 +10563,9 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
       es-shim-unscopables: 1.0.2
+    dev: true
 
   /array.prototype.tosorted@1.1.4:
     resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
@@ -10493,6 +10576,7 @@ packages:
       es-abstract: 1.23.3
       es-errors: 1.3.0
       es-shim-unscopables: 1.0.2
+    dev: true
 
   /arraybuffer.prototype.slice@1.0.3:
     resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
@@ -10501,11 +10585,12 @@ packages:
       array-buffer-byte-length: 1.0.1
       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
       get-intrinsic: 1.2.4
       is-array-buffer: 3.0.4
-      is-shared-array-buffer: 1.0.2
+      is-shared-array-buffer: 1.0.3
+    dev: true
 
   /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
@@ -10555,6 +10640,7 @@ packages:
 
   /ast-types-flow@0.0.8:
     resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
+    dev: true
 
   /ast-types@0.16.1:
     resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
@@ -10656,6 +10742,7 @@ packages:
   /axe-core@4.10.2:
     resolution: {integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==}
     engines: {node: '>=4'}
+    dev: true
 
   /axios@1.6.8:
     resolution: {integrity: sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==}
@@ -10667,6 +10754,26 @@ packages:
       - debug
     dev: false
 
+  /axios@1.7.7:
+    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
+    dependencies:
+      follow-redirects: 1.15.6
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
+  /axios@1.7.9:
+    resolution: {integrity: sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==}
+    dependencies:
+      follow-redirects: 1.15.6
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
   /axobject-query@4.1.0:
     resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
     engines: {node: '>= 0.4'}
@@ -11782,6 +11889,16 @@ packages:
     engines: {node: '>=16'}
     dev: false
 
+  /commander@12.0.0:
+    resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==}
+    engines: {node: '>=18'}
+    dev: false
+
+  /commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
+    dev: false
+
   /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
@@ -12015,6 +12132,11 @@ packages:
     requiresBuild: true
     dev: false
 
+  /core-js@3.39.0:
+    resolution: {integrity: sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==}
+    requiresBuild: true
+    dev: false
+
   /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
@@ -12037,7 +12159,7 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /cosmiconfig@8.3.6(typescript@5.3.3):
+  /cosmiconfig@8.3.6(typescript@5.7.2):
     resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -12050,9 +12172,9 @@ packages:
       js-yaml: 4.1.0
       parse-json: 5.2.0
       path-type: 4.0.0
-      typescript: 5.3.3
+      typescript: 5.7.2
 
-  /cosmiconfig@9.0.0(typescript@5.3.3):
+  /cosmiconfig@9.0.0(typescript@5.7.2):
     resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -12065,7 +12187,7 @@ packages:
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       parse-json: 5.2.0
-      typescript: 5.3.3
+      typescript: 5.7.2
     dev: true
 
   /crc-32@1.2.2:
@@ -12110,7 +12232,7 @@ packages:
       sha.js: 2.4.11
     dev: true
 
-  /create-jest@29.7.0(@types/node@18.18.5)(ts-node@10.9.2):
+  /create-jest@29.7.0(@types/node@20.17.10)(ts-node@10.9.2):
     resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -12119,7 +12241,7 @@ packages:
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+      jest-config: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -12170,6 +12292,15 @@ packages:
       shebang-command: 2.0.0
       which: 2.0.2
 
+  /cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+    dev: true
+
   /crypt@0.0.2:
     resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
     dev: false
@@ -12314,6 +12445,7 @@ packages:
 
   /damerau-levenshtein@1.0.8:
     resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
+    dev: true
 
   /data-urls@3.0.2:
     resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
@@ -12331,6 +12463,7 @@ packages:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-data-view: 1.0.1
+    dev: true
 
   /data-view-byte-length@1.0.1:
     resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
@@ -12339,6 +12472,7 @@ packages:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-data-view: 1.0.1
+    dev: true
 
   /data-view-byte-offset@1.0.0:
     resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
@@ -12347,6 +12481,7 @@ packages:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-data-view: 1.0.1
+    dev: true
 
   /dataloader@2.2.2:
     resolution: {integrity: sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==}
@@ -12432,6 +12567,7 @@ packages:
         optional: true
     dependencies:
       ms: 2.1.3
+    dev: true
 
   /debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
@@ -12444,17 +12580,6 @@ packages:
     dependencies:
       ms: 2.1.2
 
-  /debug@4.3.5:
-    resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-
   /debug@4.3.7(supports-color@5.5.0):
     resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
     engines: {node: '>=6.0'}
@@ -12551,6 +12676,7 @@ packages:
 
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+    dev: true
 
   /deep-object-diff@1.1.9:
     resolution: {integrity: sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==}
@@ -12641,6 +12767,35 @@ packages:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
 
+  /dependency-cruiser@16.8.0:
+    resolution: {integrity: sha512-VyBzIrLHfG7rT36URln+CTy8VSjrLB7YDlMx5vtBSHRHCOXgLUCcP4n5ZoD+s166T0i5LN33q1CvBkEOGsDTSg==}
+    engines: {node: ^18.17||>=20}
+    hasBin: true
+    dependencies:
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
+      acorn-jsx-walk: 2.0.0
+      acorn-loose: 8.4.0
+      acorn-walk: 8.3.4
+      ajv: 8.17.1
+      commander: 12.1.0
+      enhanced-resolve: 5.17.1
+      ignore: 6.0.2
+      interpret: 3.1.1
+      is-installed-globally: 1.0.0
+      json5: 2.2.3
+      memoize: 10.0.0
+      picocolors: 1.1.1
+      picomatch: 4.0.2
+      prompts: 2.4.2
+      rechoir: 0.8.0
+      safe-regex: 2.1.1
+      semver: 7.6.3
+      teamcity-service-messages: 0.1.14
+      tsconfig-paths-webpack-plugin: 4.2.0
+      watskeburt: 4.2.2
+    dev: false
+
   /dependency-graph@0.11.0:
     resolution: {integrity: sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==}
     engines: {node: '>= 0.6.0'}
@@ -12756,18 +12911,20 @@ packages:
     engines: {node: '>=0.10.0'}
     dependencies:
       esutils: 2.0.3
+    dev: true
 
   /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       esutils: 2.0.3
+    dev: true
 
   /docx@8.2.3:
     resolution: {integrity: sha512-Rlr/wPTDh+xQpFew3m4zYQ5OWEZO36HItyPCUbGdicB+ar4zIgseeJdqfcZIY0uQtMSrhGRpSFOTjii7h9cpHw==}
     engines: {node: '>=10'}
     dependencies:
-      '@types/node': 20.8.7
+      '@types/node': 20.17.10
       jszip: 3.10.1
       nanoid: 4.0.2
       xml: 1.0.1
@@ -12890,6 +13047,7 @@ packages:
   /dotenv@16.0.3:
     resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
     engines: {node: '>=12'}
+    dev: true
 
   /dotenv@16.4.5:
     resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
@@ -13047,52 +13205,6 @@ packages:
       stackframe: 1.3.4
     dev: true
 
-  /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.prototype.name: 1.1.6
-      get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.2
-      globalthis: 1.0.3
-      gopd: 1.0.1
-      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-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.23.3:
     resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
     engines: {node: '>= 0.4'}
@@ -13112,7 +13224,7 @@ packages:
       function.prototype.name: 1.1.6
       get-intrinsic: 1.2.4
       get-symbol-description: 1.0.2
-      globalthis: 1.0.3
+      globalthis: 1.0.4
       gopd: 1.0.1
       has-property-descriptors: 1.0.2
       has-proto: 1.0.3
@@ -13143,6 +13255,7 @@ packages:
       typed-array-length: 1.0.6
       unbox-primitive: 1.0.2
       which-typed-array: 1.1.15
+    dev: true
 
   /es-define-property@1.0.0:
     resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
@@ -13186,6 +13299,7 @@ packages:
       internal-slot: 1.0.7
       iterator.prototype: 1.1.3
       safe-array-concat: 1.1.2
+    dev: true
 
   /es-module-lexer@1.5.4:
     resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
@@ -13195,14 +13309,7 @@ packages:
     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'}
-    dependencies:
-      get-intrinsic: 1.2.4
-      has-tostringtag: 1.0.2
-      hasown: 2.0.1
+    dev: true
 
   /es-set-tostringtag@2.0.3:
     resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
@@ -13211,11 +13318,13 @@ packages:
       get-intrinsic: 1.2.4
       has-tostringtag: 1.0.2
       hasown: 2.0.2
+    dev: true
 
   /es-shim-unscopables@1.0.2:
     resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
     dependencies:
-      hasown: 2.0.1
+      hasown: 2.0.2
+    dev: true
 
   /es-to-primitive@1.2.1:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
@@ -13224,6 +13333,7 @@ packages:
       is-callable: 1.2.7
       is-date-object: 1.0.5
       is-symbol: 1.0.4
+    dev: true
 
   /es6-promise@4.2.8:
     resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
@@ -13297,6 +13407,7 @@ packages:
   /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
+    dev: true
 
   /escape-string-regexp@5.0.0:
     resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
@@ -13315,8 +13426,8 @@ packages:
       source-map: 0.6.1
     dev: false
 
-  /eslint-config-next@15.0.1(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-3cYCrgbH6GS/ufApza7XCKz92vtq4dAdYhx++rMFNlH2cAV+/GsAKkrr4+bohYOACmzG2nAOR+uWprKC1Uld6A==}
+  /eslint-config-next@15.0.3(eslint@9.17.0)(typescript@5.7.2):
+    resolution: {integrity: sha512-IGP2DdQQrgjcr4mwFPve4DrCqo7CVVez1WoYY47XwKSrYO4hC0Dlb+iJA60i0YfICOzgNADIb8r28BpQ5Zs0wg==}
     peerDependencies:
       eslint: ^7.23.0 || ^8.0.0 || ^9.0.0
       typescript: '>=3.3.1'
@@ -13324,29 +13435,30 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@next/eslint-plugin-next': 15.0.1
+      '@next/eslint-plugin-next': 15.0.3
       '@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
+      '@typescript-eslint/eslint-plugin': 8.18.1(@typescript-eslint/parser@8.18.1)(eslint@9.17.0)(typescript@5.7.2)
+      '@typescript-eslint/parser': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
+      eslint: 9.17.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
+      eslint-import-resolver-typescript: 3.5.2(eslint-plugin-import@2.31.0)(eslint@9.17.0)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.18.1)(eslint-import-resolver-typescript@3.5.2)(eslint@9.17.0)
+      eslint-plugin-jsx-a11y: 6.10.2(eslint@9.17.0)
+      eslint-plugin-react: 7.37.2(eslint@9.17.0)
+      eslint-plugin-react-hooks: 5.0.0(eslint@9.17.0)
+      typescript: 5.7.2
     transitivePeerDependencies:
       - eslint-import-resolver-webpack
       - supports-color
+    dev: true
 
-  /eslint-config-prettier@9.1.0(eslint@8.56.0):
+  /eslint-config-prettier@9.1.0(eslint@9.17.0):
     resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.56.0
+      eslint: 9.17.0
     dev: true
 
   /eslint-import-resolver-node@0.3.9:
@@ -13357,8 +13469,9 @@ packages:
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /eslint-import-resolver-typescript@3.5.2(eslint-plugin-import@2.31.0)(eslint@8.56.0):
+  /eslint-import-resolver-typescript@3.5.2(eslint-plugin-import@2.31.0)(eslint@9.17.0):
     resolution: {integrity: sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -13367,8 +13480,8 @@ packages:
     dependencies:
       debug: 4.3.7(supports-color@5.5.0)
       enhanced-resolve: 5.17.1
-      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: 9.17.0
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.18.1)(eslint-import-resolver-typescript@3.5.2)(eslint@9.17.0)
       get-tsconfig: 4.7.5
       globby: 13.1.2
       is-core-module: 2.15.1
@@ -13376,8 +13489,9 @@ packages:
       synckit: 0.8.4
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /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):
+  /eslint-module-utils@2.12.0(@typescript-eslint/parser@8.18.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.2)(eslint@9.17.0):
     resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -13398,15 +13512,16 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
       debug: 3.2.7
-      eslint: 8.56.0
+      eslint: 9.17.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-import-resolver-typescript: 3.5.2(eslint-plugin-import@2.31.0)(eslint@9.17.0)
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /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-import@2.31.0(@typescript-eslint/parser@8.18.1)(eslint-import-resolver-typescript@3.5.2)(eslint@9.17.0):
     resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -13417,16 +13532,16 @@ packages:
         optional: true
     dependencies:
       '@rtsao/scc': 1.1.0
-      '@typescript-eslint/parser': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
       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: 9.17.0
       eslint-import-resolver-node: 0.3.9
-      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)
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.18.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.2)(eslint@9.17.0)
       hasown: 2.0.2
       is-core-module: 2.15.1
       is-glob: 4.0.3
@@ -13441,9 +13556,10 @@ packages:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
+    dev: true
 
-  /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==}
+  /eslint-plugin-jest@28.9.0(@typescript-eslint/eslint-plugin@8.18.1)(eslint@9.17.0)(typescript@5.7.2):
+    resolution: {integrity: sha512-rLu1s1Wf96TgUUxSw6loVIkNtUjq1Re7A9QdCCHSohnvXEBAjuL420h0T/fMmkQlNsQP2GhQzEUpYHPfxBkvYQ==}
     engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -13455,15 +13571,15 @@ packages:
       jest:
         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': 7.18.0(eslint@8.56.0)(typescript@5.3.3)
-      eslint: 8.56.0
+      '@typescript-eslint/eslint-plugin': 8.18.1(@typescript-eslint/parser@8.18.1)(eslint@9.17.0)(typescript@5.7.2)
+      '@typescript-eslint/utils': 7.18.0(eslint@9.17.0)(typescript@5.7.2)
+      eslint: 9.17.0
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: false
+    dev: true
 
-  /eslint-plugin-jsx-a11y@6.10.2(eslint@8.56.0):
+  /eslint-plugin-jsx-a11y@6.10.2(eslint@9.17.0):
     resolution: {integrity: sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -13477,7 +13593,7 @@ packages:
       axobject-query: 4.1.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      eslint: 8.56.0
+      eslint: 9.17.0
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
       language-tags: 1.0.9
@@ -13485,8 +13601,9 @@ packages:
       object.fromentries: 2.0.8
       safe-regex-test: 1.0.3
       string.prototype.includes: 2.0.1
+    dev: true
 
-  /eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.3.3):
+  /eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0)(eslint@9.17.0)(prettier@3.4.2):
     resolution: {integrity: sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -13500,22 +13617,23 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 8.56.0
-      eslint-config-prettier: 9.1.0(eslint@8.56.0)
-      prettier: 3.3.3
+      eslint: 9.17.0
+      eslint-config-prettier: 9.1.0(eslint@9.17.0)
+      prettier: 3.4.2
       prettier-linter-helpers: 1.0.0
       synckit: 0.9.2
     dev: true
 
-  /eslint-plugin-react-hooks@5.0.0(eslint@8.56.0):
+  /eslint-plugin-react-hooks@5.0.0(eslint@9.17.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 || ^9.0.0
     dependencies:
-      eslint: 8.56.0
+      eslint: 9.17.0
+    dev: true
 
-  /eslint-plugin-react@7.37.2(eslint@8.56.0):
+  /eslint-plugin-react@7.37.2(eslint@9.17.0):
     resolution: {integrity: sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -13527,7 +13645,7 @@ packages:
       array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
       es-iterator-helpers: 1.1.0
-      eslint: 8.56.0
+      eslint: 9.17.0
       estraverse: 5.3.0
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
@@ -13540,30 +13658,31 @@ packages:
       semver: 6.3.1
       string.prototype.matchall: 4.0.11
       string.prototype.repeat: 1.0.0
+    dev: true
 
-  /eslint-plugin-storybook@0.8.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-CZeVO5EzmPY7qghO2t64oaFM+8FTaD4uzOEjHKp516exyTKo+skKAL9GI3QALS2BXhyALJjNtwbmr1XinGE8bA==}
+  /eslint-plugin-storybook@0.11.1(eslint@9.17.0)(typescript@5.7.2):
+    resolution: {integrity: sha512-yGKpAYkBm/Q2hZg476vRUAvd9lAccjjSvzU5nYy3BSQbKTPy7uopx7JEpwk2vSuw4weTMZzWF64z9/gp/K5RCg==}
     engines: {node: '>= 18'}
     peerDependencies:
       eslint: '>=6'
     dependencies:
-      '@storybook/csf': 0.0.1
-      '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3)
-      eslint: 8.56.0
-      requireindex: 1.2.0
+      '@storybook/csf': 0.1.11
+      '@typescript-eslint/utils': 8.18.1(eslint@9.17.0)(typescript@5.7.2)
+      eslint: 9.17.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /eslint-plugin-turbo@2.2.3(eslint@8.56.0):
-    resolution: {integrity: sha512-LHt35VwxthdGVO6hQRfvmFb6ee8/exAzAYWCy4o87Bnp7urltP8qg7xMd4dPSLAhtfnI2xSo1WgeVaR3MeItxw==}
+  /eslint-plugin-turbo@2.3.3(eslint@9.17.0):
+    resolution: {integrity: sha512-j8UEA0Z+NNCsjZep9G5u5soDQHcXq/x4amrwulk6eHF1U91H2qAjp5I4jQcvJewmccCJbVp734PkHHTRnosjpg==}
     peerDependencies:
       eslint: '>6.6.0'
     dependencies:
       dotenv: 16.0.3
-      eslint: 8.56.0
+      eslint: 9.17.0
+    dev: true
 
   /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
@@ -13572,70 +13691,80 @@ packages:
       esrecurse: 4.3.0
       estraverse: 4.3.0
 
-  /eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /eslint-scope@8.2.0:
+    resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
+    dev: true
 
   /eslint-visitor-keys@3.4.3:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
 
-  /eslint@8.56.0:
-    resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /eslint-visitor-keys@4.2.0:
+    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    dev: true
+
+  /eslint@9.17.0:
+    resolution: {integrity: sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
+    peerDependencies:
+      jiti: '*'
+    peerDependenciesMeta:
+      jiti:
+        optional: true
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
-      '@eslint-community/regexpp': 4.6.2
-      '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.56.0
-      '@humanwhocodes/config-array': 0.11.14
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.17.0)
+      '@eslint-community/regexpp': 4.12.1
+      '@eslint/config-array': 0.19.1
+      '@eslint/core': 0.9.1
+      '@eslint/eslintrc': 3.2.0
+      '@eslint/js': 9.17.0
+      '@eslint/plugin-kit': 0.2.4
+      '@humanfs/node': 0.16.6
       '@humanwhocodes/module-importer': 1.0.1
-      '@nodelib/fs.walk': 1.2.8
-      '@ungap/structured-clone': 1.2.0
+      '@humanwhocodes/retry': 0.4.1
+      '@types/estree': 1.0.6
+      '@types/json-schema': 7.0.15
       ajv: 6.12.6
       chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.4
-      doctrine: 3.0.0
+      cross-spawn: 7.0.6
+      debug: 4.3.7(supports-color@5.5.0)
       escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
+      eslint-scope: 8.2.0
+      eslint-visitor-keys: 4.2.0
+      espree: 10.3.0
       esquery: 1.5.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
+      file-entry-cache: 8.0.0
       find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.21.0
-      graphemer: 1.4.0
-      ignore: 5.2.4
+      ignore: 5.3.2
       imurmurhash: 0.1.4
       is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.1.2
       natural-compare: 1.4.0
       optionator: 0.9.3
-      strip-ansi: 6.0.1
-      text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /espree@9.6.1:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /espree@10.3.0:
+    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
-      acorn: 8.11.3
-      acorn-jsx: 5.3.2(acorn@8.11.3)
-      eslint-visitor-keys: 3.4.3
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
+      eslint-visitor-keys: 4.2.0
+    dev: true
 
   /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
@@ -13647,6 +13776,7 @@ packages:
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
+    dev: true
 
   /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
@@ -13892,6 +14022,7 @@ packages:
 
   /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+    dev: true
 
   /fast-querystring@1.1.2:
     resolution: {integrity: sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==}
@@ -13914,7 +14045,6 @@ packages:
 
   /fast-uri@3.0.1:
     resolution: {integrity: sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==}
-    dev: true
 
   /fast-url-parser@1.1.3:
     resolution: {integrity: sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==}
@@ -13989,11 +14119,12 @@ packages:
       is-unicode-supported: 1.3.0
     dev: false
 
-  /file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /file-entry-cache@8.0.0:
+    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+    engines: {node: '>=16.0.0'}
     dependencies:
-      flat-cache: 3.0.4
+      flat-cache: 4.0.1
+    dev: true
 
   /file-saver@2.0.5:
     resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
@@ -14102,6 +14233,15 @@ packages:
     dependencies:
       flatted: 3.2.7
       rimraf: 3.0.2
+    dev: true
+
+  /flat-cache@4.0.1:
+    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+    engines: {node: '>=16'}
+    dependencies:
+      flatted: 3.3.2
+      keyv: 4.5.4
+    dev: true
 
   /flat@5.0.2:
     resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
@@ -14110,6 +14250,11 @@ packages:
 
   /flatted@3.2.7:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+    dev: true
+
+  /flatted@3.3.2:
+    resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==}
+    dev: true
 
   /follow-redirects@1.15.6:
     resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
@@ -14134,7 +14279,7 @@ packages:
       signal-exit: 4.1.0
     dev: false
 
-  /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.3.3)(webpack@5.93.0):
+  /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.7.2)(webpack@5.93.0):
     resolution: {integrity: sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==}
     engines: {node: '>=12.13.0', yarn: '>=1.0.0'}
     peerDependencies:
@@ -14153,7 +14298,7 @@ packages:
       schema-utils: 3.3.0
       semver: 7.6.3
       tapable: 2.2.1
-      typescript: 5.3.3
+      typescript: 5.7.2
       webpack: 5.93.0(esbuild@0.21.5)
     dev: true
 
@@ -14306,8 +14451,9 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.4
+      es-abstract: 1.23.3
       functions-have-names: 1.2.3
+    dev: true
 
   /functions-have-names@1.2.3:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
@@ -14427,6 +14573,7 @@ packages:
       call-bind: 1.0.7
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
+    dev: true
 
   /get-tsconfig@4.7.5:
     resolution: {integrity: sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==}
@@ -14500,6 +14647,7 @@ packages:
       minimatch: 3.1.2
       once: 1.4.0
       path-is-absolute: 1.0.1
+    dev: true
 
   /glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
@@ -14522,6 +14670,13 @@ packages:
       minipass: 4.2.8
       path-scurry: 1.11.1
 
+  /global-directory@4.0.1:
+    resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==}
+    engines: {node: '>=18'}
+    dependencies:
+      ini: 4.1.1
+    dev: false
+
   /global-dirs@3.0.1:
     resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
     engines: {node: '>=10'}
@@ -14533,17 +14688,15 @@ packages:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
 
-  /globals@13.21.0:
-    resolution: {integrity: sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==}
-    engines: {node: '>=8'}
-    dependencies:
-      type-fest: 0.20.2
+  /globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+    dev: true
 
-  /globalthis@1.0.3:
-    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      define-properties: 1.2.1
+  /globals@15.14.0:
+    resolution: {integrity: sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==}
+    engines: {node: '>=18'}
+    dev: true
 
   /globalthis@1.0.4:
     resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
@@ -14551,9 +14704,11 @@ packages:
     dependencies:
       define-properties: 1.2.1
       gopd: 1.0.1
+    dev: true
 
   /globalyzer@0.1.0:
     resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
+    dev: true
 
   /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
@@ -14571,7 +14726,7 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
       dir-glob: 3.0.1
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 4.0.0
@@ -14590,6 +14745,7 @@ packages:
 
   /globrex@0.1.2:
     resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+    dev: true
 
   /goober@2.1.14(csstype@3.1.3):
     resolution: {integrity: sha512-4UpC0NdGyAFqLNPnhCT2iHpza2q+RAY3GV85a/mRPdzyPQMsj0KmMMuetdIkzWRbJ+Hgau1EZztq8ImmiMGhsg==}
@@ -14658,6 +14814,7 @@ packages:
 
   /graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+    dev: true
 
   /graphql-codegen@0.4.0:
     resolution: {integrity: sha512-OnLWOmsg5Wi7Z0rcVBzLr1oWM/sd/CgL65ANcrLxu03KTJt42bTLbgDalRs++oDRg++FuyYXbQXJJCKIV8sHeA==}
@@ -14672,7 +14829,7 @@ packages:
       yargs: 5.0.0
     dev: false
 
-  /graphql-config@5.1.2(@types/node@18.18.5)(graphql@16.9.0)(typescript@5.3.3):
+  /graphql-config@5.1.2(@types/node@20.17.10)(graphql@16.9.0)(typescript@5.7.2):
     resolution: {integrity: sha512-kVwUuFz1h9u7B0nDPtnLFWN+x018niaH3zi1ChFCNfbunhDVJ911Z3YcglK5EfDfySeeH+zCa1aGxd1wMgNd7g==}
     engines: {node: '>= 16.0.0'}
     peerDependencies:
@@ -14686,9 +14843,9 @@ packages:
       '@graphql-tools/json-file-loader': 8.0.1(graphql@16.9.0)
       '@graphql-tools/load': 8.0.2(graphql@16.9.0)
       '@graphql-tools/merge': 9.0.7(graphql@16.9.0)
-      '@graphql-tools/url-loader': 8.0.2(@types/node@18.18.5)(graphql@16.9.0)
+      '@graphql-tools/url-loader': 8.0.2(@types/node@20.17.10)(graphql@16.9.0)
       '@graphql-tools/utils': 10.5.4(graphql@16.9.0)
-      cosmiconfig: 9.0.0(typescript@5.3.3)
+      cosmiconfig: 9.0.0(typescript@5.7.2)
       graphql: 16.9.0
       jiti: 1.21.6
       minimatch: 9.0.5
@@ -14826,6 +14983,7 @@ packages:
   /has-proto@1.0.3:
     resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
     engines: {node: '>= 0.4'}
+    dev: true
 
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
@@ -14985,6 +15143,11 @@ packages:
       lru-cache: 10.2.2
     dev: false
 
+  /hpagent@1.2.0:
+    resolution: {integrity: sha512-A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==}
+    engines: {node: '>=14'}
+    dev: false
+
   /html-encoding-sniffer@3.0.0:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
@@ -15200,6 +15363,11 @@ packages:
     resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
     engines: {node: '>= 4'}
 
+  /ignore@6.0.2:
+    resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==}
+    engines: {node: '>= 4'}
+    dev: false
+
   /image-size@1.0.2:
     resolution: {integrity: sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg==}
     engines: {node: '>=14.0.0'}
@@ -15262,6 +15430,7 @@ packages:
   /imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
+    dev: true
 
   /indent-string@4.0.0:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
@@ -15299,6 +15468,11 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /ini@4.1.1:
+    resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    dev: false
+
   /inline-style-parser@0.1.1:
     resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
     dev: false
@@ -15317,7 +15491,7 @@ packages:
       - supports-color
     dev: true
 
-  /inngest@3.16.1(typescript@5.3.3):
+  /inngest@3.16.1(typescript@5.7.2):
     resolution: {integrity: sha512-5jhrVtVzMthyscaI8La73y0rAKEoTtdFg4LpV2ksaET58MmwBBkjH1qPAdIfFMhJrWS+ITQ7HNdzj3nWk+aDBg==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -15334,7 +15508,7 @@ packages:
       ms: 2.1.3
       serialize-error-cjs: 0.1.3
       strip-ansi: 5.2.0
-      typescript: 5.3.3
+      typescript: 5.7.2
       zod: 3.22.4
     transitivePeerDependencies:
       - encoding
@@ -15418,6 +15592,11 @@ packages:
       hasown: 2.0.1
       side-channel: 1.0.4
 
+  /interpret@3.1.1:
+    resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==}
+    engines: {node: '>=10.13.0'}
+    dev: false
+
   /into-stream@7.0.0:
     resolution: {integrity: sha512-2dYz766i9HprMBasCMvHMuazJ7u4WzhJwo5kb3iPSiW/iRYV6uPari3zHoqZlnuaR7V1bEiNMxikhp37rdBXbw==}
     engines: {node: '>=12'}
@@ -15505,6 +15684,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.2
+    dev: true
 
   /is-bigint@1.0.4:
     resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
@@ -15555,6 +15735,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       is-typed-array: 1.1.13
+    dev: true
 
   /is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
@@ -15589,6 +15770,7 @@ packages:
     resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
     dependencies:
       call-bind: 1.0.7
+    dev: true
 
   /is-fullwidth-code-point@1.0.0:
     resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==}
@@ -15656,6 +15838,14 @@ packages:
       is-path-inside: 3.0.3
     dev: true
 
+  /is-installed-globally@1.0.0:
+    resolution: {integrity: sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      global-directory: 4.0.1
+      is-path-inside: 4.0.0
+    dev: false
+
   /is-interactive@1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -15689,13 +15879,10 @@ packages:
       define-properties: 1.2.1
     dev: true
 
-  /is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
-
   /is-negative-zero@2.0.3:
     resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
     engines: {node: '>= 0.4'}
+    dev: true
 
   /is-node-process@1.2.0:
     resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==}
@@ -15723,6 +15910,12 @@ packages:
   /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
+    dev: true
+
+  /is-path-inside@4.0.0:
+    resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==}
+    engines: {node: '>=12'}
+    dev: false
 
   /is-plain-obj@1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
@@ -15775,12 +15968,14 @@ packages:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
       call-bind: 1.0.7
+    dev: false
 
   /is-shared-array-buffer@1.0.3:
     resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.7
+    dev: true
 
   /is-stream@1.1.0:
     resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
@@ -15863,6 +16058,7 @@ packages:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
       call-bind: 1.0.7
+    dev: true
 
   /is-weakset@2.0.2:
     resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
@@ -16005,6 +16201,7 @@ packages:
       has-symbols: 1.0.3
       reflect.getprototypeof: 1.0.5
       set-function-name: 2.0.2
+    dev: true
 
   /jackspeak@3.4.3:
     resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
@@ -16032,7 +16229,7 @@ packages:
 
   /javascript-natural-sort@0.7.1:
     resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==}
-    dev: false
+    dev: true
 
   /jest-changed-files@29.7.0:
     resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
@@ -16051,7 +16248,7 @@ packages:
       '@jest/expect': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       chalk: 4.1.2
       co: 4.6.0
       dedent: 1.5.3
@@ -16072,7 +16269,7 @@ packages:
       - supports-color
     dev: true
 
-  /jest-cli@29.7.0(@types/node@18.18.5)(ts-node@10.9.2):
+  /jest-cli@29.7.0(@types/node@20.17.10)(ts-node@10.9.2):
     resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -16086,10 +16283,10 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+      create-jest: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       exit: 0.1.2
       import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+      jest-config: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -16100,7 +16297,7 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config@29.7.0(@types/node@18.18.5)(ts-node@10.9.2):
+  /jest-config@29.7.0(@types/node@20.17.10)(ts-node@10.9.2):
     resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -16115,7 +16312,7 @@ packages:
       '@babel/core': 7.24.5
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       babel-jest: 29.7.0(@babel/core@7.24.5)
       chalk: 4.1.2
       ci-info: 3.9.0
@@ -16135,7 +16332,7 @@ packages:
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.9.2(@types/node@18.18.5)(typescript@5.3.3)
+      ts-node: 10.9.2(@types/node@20.17.10)(typescript@5.7.2)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -16180,7 +16377,7 @@ packages:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
       '@types/jsdom': 20.0.1
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       jest-mock: 29.7.0
       jest-util: 29.7.0
       jsdom: 20.0.3
@@ -16197,7 +16394,7 @@ packages:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       jest-mock: 29.7.0
       jest-util: 29.7.0
     dev: true
@@ -16212,7 +16409,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.9
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -16246,7 +16443,7 @@ packages:
     resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/code-frame': 7.24.2
+      '@babel/code-frame': 7.24.7
       '@jest/types': 29.6.3
       '@types/stack-utils': 2.0.3
       chalk: 4.1.2
@@ -16261,7 +16458,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       jest-util: 29.7.0
 
   /jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
@@ -16315,7 +16512,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -16346,7 +16543,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       chalk: 4.1.2
       cjs-module-lexer: 1.3.1
       collect-v8-coverage: 1.0.2
@@ -16393,6 +16590,13 @@ packages:
       - supports-color
     dev: true
 
+  /jest-sonar-reporter@2.0.0:
+    resolution: {integrity: sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==}
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      xml: 1.0.1
+    dev: false
+
   /jest-transform-stub@2.0.0:
     resolution: {integrity: sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg==}
     dev: false
@@ -16402,7 +16606,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
@@ -16426,7 +16630,7 @@ packages:
     dependencies:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -16438,7 +16642,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
@@ -16446,13 +16650,13 @@ packages:
     resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest@29.7.0(@types/node@18.18.5)(ts-node@10.9.2):
+  /jest@29.7.0(@types/node@20.17.10)(ts-node@10.9.2):
     resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -16465,7 +16669,7 @@ packages:
       '@jest/core': 29.7.0(ts-node@10.9.2)
       '@jest/types': 29.6.3
       import-local: 3.1.0
-      jest-cli: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+      jest-cli: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -16619,7 +16823,6 @@ packages:
 
   /json-schema-traverse@1.0.0:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
 
   /json-schema@0.4.0:
     resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
@@ -16627,6 +16830,7 @@ packages:
 
   /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+    dev: true
 
   /json-stringify-safe@5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
@@ -16644,6 +16848,7 @@ packages:
     hasBin: true
     dependencies:
       minimist: 1.2.8
+    dev: true
 
   /json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
@@ -16701,7 +16906,7 @@ packages:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.6.2
+      semver: 7.6.3
     dev: true
 
   /jsx-ast-utils@3.3.5:
@@ -16712,6 +16917,7 @@ packages:
       array.prototype.flat: 1.3.2
       object.assign: 4.1.5
       object.values: 1.2.0
+    dev: true
 
   /jszip@3.10.1:
     resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
@@ -16765,7 +16971,6 @@ packages:
   /kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
-    dev: true
 
   /koalas@1.0.2:
     resolution: {integrity: sha512-RYhBbYaTTTHId3l6fnMZc3eGQNW6FVCqMG6AMwA5I1Mafr6AflaXeoi6x3xQuATRotGYRLk6+1ELZH4dstFNOA==}
@@ -17125,12 +17330,14 @@ packages:
 
   /language-subtag-registry@0.3.22:
     resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==}
+    dev: true
 
   /language-tags@1.0.9:
     resolution: {integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==}
     engines: {node: '>=0.10'}
     dependencies:
       language-subtag-registry: 0.3.22
+    dev: true
 
   /languagedetect@2.0.0:
     resolution: {integrity: sha512-AZb/liiQ+6ZoTj4f1J0aE6OkzhCo8fyH+tuSaPfSo8YHCWLFJrdSixhtO2TYdIkjcDQNaR4RmGaV2A5FJklDMQ==}
@@ -17169,6 +17376,7 @@ packages:
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
+    dev: true
 
   /lie@3.3.0:
     resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
@@ -17780,6 +17988,13 @@ packages:
       fs-monkey: 1.0.6
     dev: true
 
+  /memoize@10.0.0:
+    resolution: {integrity: sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==}
+    engines: {node: '>=18'}
+    dependencies:
+      mimic-function: 5.0.1
+    dev: false
+
   /memoizerific@1.11.3:
     resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==}
     dependencies:
@@ -17818,7 +18033,7 @@ packages:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
 
-  /meros@1.3.0(@types/node@18.18.5):
+  /meros@1.3.0(@types/node@20.17.10):
     resolution: {integrity: sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==}
     engines: {node: '>=13'}
     peerDependencies:
@@ -17827,7 +18042,7 @@ packages:
       '@types/node':
         optional: true
     dependencies:
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
     dev: true
 
   /methods@1.1.2:
@@ -18136,6 +18351,11 @@ packages:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
 
+  /mimic-function@5.0.1:
+    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
+    engines: {node: '>=18'}
+    dev: false
+
   /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
@@ -18317,10 +18537,10 @@ packages:
       msw: ^2.0.0
     dependencies:
       is-node-process: 1.2.0
-      msw: 2.6.5(@types/node@18.18.5)(typescript@5.3.3)
+      msw: 2.6.5(@types/node@20.17.10)(typescript@5.7.2)
     dev: true
 
-  /msw@2.6.5(@types/node@18.18.5)(typescript@5.3.3):
+  /msw@2.6.5(@types/node@20.17.10)(typescript@5.7.2):
     resolution: {integrity: sha512-PnlnTpUlOrj441kYQzzFhzMzMCGFT6a2jKUBG7zSpLkYS5oh8Arrbc0dL8/rNAtxaoBy0EVs2mFqj2qdmWK7lQ==}
     engines: {node: '>=18'}
     hasBin: true
@@ -18334,7 +18554,7 @@ packages:
       '@bundled-es-modules/cookie': 2.0.1
       '@bundled-es-modules/statuses': 1.0.1
       '@bundled-es-modules/tough-cookie': 0.1.6
-      '@inquirer/confirm': 5.0.2(@types/node@18.18.5)
+      '@inquirer/confirm': 5.0.2(@types/node@20.17.10)
       '@mswjs/interceptors': 0.37.1
       '@open-draft/deferred-promise': 2.2.0
       '@open-draft/until': 2.1.0
@@ -18348,7 +18568,7 @@ packages:
       path-to-regexp: 6.3.0
       strict-event-emitter: 0.5.1
       type-fest: 4.27.0
-      typescript: 5.3.3
+      typescript: 5.7.2
       yargs: 17.7.2
     transitivePeerDependencies:
       - '@types/node'
@@ -18402,6 +18622,7 @@ packages:
 
   /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+    dev: true
 
   /negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
@@ -18600,6 +18821,11 @@ packages:
     dependencies:
       whatwg-url: 5.0.0
 
+  /node-forge@1.3.1:
+    resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
+    engines: {node: '>= 6.13.0'}
+    dev: false
+
   /node-gyp-build@3.9.0:
     resolution: {integrity: sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==}
     hasBin: true
@@ -18684,7 +18910,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       hosted-git-info: 4.1.0
-      is-core-module: 2.13.1
+      is-core-module: 2.15.1
       semver: 7.6.3
       validate-npm-package-license: 3.0.4
     dev: false
@@ -18694,7 +18920,7 @@ packages:
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
       hosted-git-info: 7.0.1
-      is-core-module: 2.13.1
+      is-core-module: 2.15.1
       semver: 7.6.3
       validate-npm-package-license: 3.0.4
     dev: false
@@ -18868,6 +19094,7 @@ packages:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
+    dev: true
 
   /object.fromentries@2.0.8:
     resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
@@ -18877,6 +19104,7 @@ packages:
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-object-atoms: 1.0.0
+    dev: true
 
   /object.groupby@1.0.3:
     resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
@@ -18885,6 +19113,7 @@ packages:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
+    dev: true
 
   /object.values@1.2.0:
     resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
@@ -18893,6 +19122,7 @@ packages:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
+    dev: true
 
   /objectorarray@1.0.5:
     resolution: {integrity: sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==}
@@ -19009,6 +19239,7 @@ packages:
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
+    dev: true
 
   /ora@5.4.1:
     resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
@@ -19524,10 +19755,19 @@ packages:
   /picocolors@1.0.1:
     resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
 
+  /picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+    dev: false
+
   /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  /picomatch@4.0.2:
+    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
+    engines: {node: '>=12'}
+    dev: false
+
   /pidtree@0.6.0:
     resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
     engines: {node: '>=0.10'}
@@ -19650,11 +19890,11 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /pnp-webpack-plugin@1.7.0(typescript@5.3.3):
+  /pnp-webpack-plugin@1.7.0(typescript@5.7.2):
     resolution: {integrity: sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==}
     engines: {node: '>=6'}
     dependencies:
-      ts-pnp: 1.2.0(typescript@5.3.3)
+      ts-pnp: 1.2.0(typescript@5.7.2)
     transitivePeerDependencies:
       - typescript
     dev: true
@@ -19715,10 +19955,10 @@ packages:
     dependencies:
       lilconfig: 2.1.0
       postcss: 8.4.35
-      ts-node: 10.9.2(@types/node@18.18.5)(typescript@5.3.3)
+      ts-node: 10.9.2(@types/node@20.17.10)(typescript@5.7.2)
       yaml: 2.3.4
 
-  /postcss-loader@8.1.1(postcss@8.4.38)(typescript@5.3.3)(webpack@5.93.0):
+  /postcss-loader@8.1.1(postcss@8.4.38)(typescript@5.7.2)(webpack@5.93.0):
     resolution: {integrity: sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==}
     engines: {node: '>= 18.12.0'}
     peerDependencies:
@@ -19731,7 +19971,7 @@ packages:
       webpack:
         optional: true
     dependencies:
-      cosmiconfig: 9.0.0(typescript@5.3.3)
+      cosmiconfig: 9.0.0(typescript@5.7.2)
       jiti: 1.21.6
       postcss: 8.4.38
       semver: 7.6.3
@@ -19854,18 +20094,20 @@ packages:
       xtend: 4.0.2
     dev: false
 
-  /posthog-js@1.139.1:
-    resolution: {integrity: sha512-+JDu2S7z6sh9Q5kj0oh/W8PZJMQ1gSigWi7gbY4NwwCq2M3t0wNFjxlfHbAo1GncRWDxen+IC+3J7oJ8TJGnkA==}
+  /posthog-js@1.202.2:
+    resolution: {integrity: sha512-9p7dAWuCfoM0WrasubGwtC8i38HU3iMqK3gd0mhyAoTrEVMVozTQq64Toc2VEv8H69NGNn6ikk5t2LclHT9XFA==}
     dependencies:
+      core-js: 3.39.0
       fflate: 0.4.8
       preact: 10.20.2
+      web-vitals: 4.2.4
     dev: false
 
-  /posthog-node@4.0.0:
-    resolution: {integrity: sha512-jEZnNbgb/3FNk+gNwtTcyz3j+62zIN+UTPotONfacVXJnoI70KScSkKdIR+rvP9tA2kjBSoHQxGwJuizs27o9A==}
+  /posthog-node@4.3.2:
+    resolution: {integrity: sha512-vy8Mt9IEfniUgqQ1rOCQ31CBO1VNqDGd3ZtHlWR9/YfU6RiuK+9pUXPb4h6HTGzQmjL8NFnjd8K8NMXSX8S6MQ==}
     engines: {node: '>=15.0.0'}
     dependencies:
-      axios: 1.6.8
+      axios: 1.7.9
       rusha: 0.8.14
     transitivePeerDependencies:
       - debug
@@ -19891,9 +20133,6 @@ packages:
   /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
-
-  /prettier-config@1.0.0:
-    resolution: {integrity: sha512-D5n2lCfmACTpARhHPFh9eqpQCGjLor3khMkqzi/EhYeZ8+Xe3Q+6c5oZIpNMZQybsRm4ijn2ihQniue61juQhg==}
     dev: true
 
   /prettier-linter-helpers@1.0.0:
@@ -19903,25 +20142,27 @@ packages:
       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==}
+  /prettier-plugin-tailwindcss@0.6.9(@trivago/prettier-plugin-sort-imports@4.3.0)(prettier@3.4.2):
+    resolution: {integrity: sha512-r0i3uhaZAXYP0At5xGfJH876W3HHGHDp+LCRUJrs57PBeQ6mYHMwr25KH8NPX44F2yGTvdnH7OqCshlQx183Eg==}
     engines: {node: '>=14.21.3'}
     peerDependencies:
       '@ianvs/prettier-plugin-sort-imports': '*'
       '@prettier/plugin-pug': '*'
       '@shopify/prettier-plugin-liquid': '*'
       '@trivago/prettier-plugin-sort-imports': '*'
+      '@zackad/prettier-plugin-twig-melody': '*'
       prettier: ^3.0
       prettier-plugin-astro: '*'
       prettier-plugin-css-order: '*'
       prettier-plugin-import-sort: '*'
       prettier-plugin-jsdoc: '*'
       prettier-plugin-marko: '*'
+      prettier-plugin-multiline-arrays: '*'
       prettier-plugin-organize-attributes: '*'
       prettier-plugin-organize-imports: '*'
+      prettier-plugin-sort-imports: '*'
       prettier-plugin-style-order: '*'
       prettier-plugin-svelte: '*'
-      prettier-plugin-twig-melody: '*'
     peerDependenciesMeta:
       '@ianvs/prettier-plugin-sort-imports':
         optional: true
@@ -19931,6 +20172,8 @@ packages:
         optional: true
       '@trivago/prettier-plugin-sort-imports':
         optional: true
+      '@zackad/prettier-plugin-twig-melody':
+        optional: true
       prettier-plugin-astro:
         optional: true
       prettier-plugin-css-order:
@@ -19941,28 +20184,25 @@ packages:
         optional: true
       prettier-plugin-marko:
         optional: true
+      prettier-plugin-multiline-arrays:
+        optional: true
       prettier-plugin-organize-attributes:
         optional: true
       prettier-plugin-organize-imports:
         optional: true
+      prettier-plugin-sort-imports:
+        optional: true
       prettier-plugin-style-order:
         optional: true
       prettier-plugin-svelte:
         optional: true
-      prettier-plugin-twig-melody:
-        optional: true
     dependencies:
-      '@trivago/prettier-plugin-sort-imports': 4.3.0(prettier@3.2.5)
-      prettier: 3.2.5
-    dev: false
-
-  /prettier@3.2.5:
-    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
-    engines: {node: '>=14'}
-    hasBin: true
+      '@trivago/prettier-plugin-sort-imports': 4.3.0(prettier@3.4.2)
+      prettier: 3.4.2
+    dev: true
 
-  /prettier@3.3.3:
-    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
+  /prettier@3.4.2:
+    resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -20049,7 +20289,6 @@ packages:
     dependencies:
       kleur: 3.0.3
       sisteransi: 1.0.5
-    dev: true
 
   /prop-types@15.8.1:
     resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
@@ -20063,6 +20302,10 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
+  /properties-file@3.5.4:
+    resolution: {integrity: sha512-OGQPWZ4j9ENDKBl+wUHqNtzayGF5sLlVcmjcqEMUUHeCbUSggDndii+kjcBDPj3GQvqYB9sUEc4siX36wx4glw==}
+    dev: false
+
   /property-information@5.6.0:
     resolution: {integrity: sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==}
     dependencies:
@@ -20091,7 +20334,7 @@ packages:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       long: 5.2.3
     dev: false
 
@@ -20278,12 +20521,12 @@ packages:
       tween-functions: 1.2.0
     dev: true
 
-  /react-docgen-typescript@2.2.2(typescript@5.3.3):
+  /react-docgen-typescript@2.2.2(typescript@5.7.2):
     resolution: {integrity: sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==}
     peerDependencies:
       typescript: '>= 4.3.x'
     dependencies:
-      typescript: 5.3.3
+      typescript: 5.7.2
     dev: true
 
   /react-docgen@7.0.3:
@@ -20386,38 +20629,38 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /react-remove-scroll-bar@2.3.6(@types/react@18.2.57)(react@18.2.0):
-    resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==}
+  /react-remove-scroll-bar@2.3.8(@types/react@18.2.57)(react@18.2.0):
+    resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
     peerDependenciesMeta:
       '@types/react':
         optional: true
     dependencies:
       '@types/react': 18.2.57
       react: 18.2.0
-      react-style-singleton: 2.2.1(@types/react@18.2.57)(react@18.2.0)
+      react-style-singleton: 2.2.3(@types/react@18.2.57)(react@18.2.0)
       tslib: 2.7.0
     dev: false
 
-  /react-remove-scroll@2.6.0(@types/react@18.2.57)(react@18.2.0):
-    resolution: {integrity: sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==}
+  /react-remove-scroll@2.6.2(@types/react@18.2.57)(react@18.2.0):
+    resolution: {integrity: sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
     dependencies:
       '@types/react': 18.2.57
       react: 18.2.0
-      react-remove-scroll-bar: 2.3.6(@types/react@18.2.57)(react@18.2.0)
+      react-remove-scroll-bar: 2.3.8(@types/react@18.2.57)(react@18.2.0)
       react-style-singleton: 2.2.1(@types/react@18.2.57)(react@18.2.0)
       tslib: 2.7.0
-      use-callback-ref: 1.3.2(@types/react@18.2.57)(react@18.2.0)
+      use-callback-ref: 1.3.3(@types/react@18.2.57)(react@18.2.0)
       use-sidecar: 1.1.2(@types/react@18.2.57)(react@18.2.0)
     dev: false
 
@@ -20438,6 +20681,22 @@ packages:
       tslib: 2.7.0
     dev: false
 
+  /react-style-singleton@2.2.3(@types/react@18.2.57)(react@18.2.0):
+    resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.2.57
+      get-nonce: 1.0.1
+      react: 18.2.0
+      tslib: 2.7.0
+    dev: false
+
   /react-syntax-highlighter@15.5.0(react@18.2.0):
     resolution: {integrity: sha512-+zq2myprEnQmH5yw6Gqc8lD55QHnpKaU8TOcFeC/Lg/MQSs8UknEA0JC4nTZGFAXC2J2Hyj/ijJ7NlabyPi2gg==}
     peerDependencies:
@@ -20597,6 +20856,13 @@ packages:
       tiny-invariant: 1.3.3
       tslib: 2.7.0
 
+  /rechoir@0.8.0:
+    resolution: {integrity: sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==}
+    engines: {node: '>= 10.13.0'}
+    dependencies:
+      resolve: 1.22.8
+    dev: false
+
   /redent@3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
     engines: {node: '>=8'}
@@ -20616,11 +20882,12 @@ packages:
     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
       get-intrinsic: 1.2.4
-      globalthis: 1.0.3
+      globalthis: 1.0.4
       which-builtin-type: 1.1.3
+    dev: true
 
   /refractor@3.6.0:
     resolution: {integrity: sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==}
@@ -20662,6 +20929,11 @@ packages:
     resolution: {integrity: sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==}
     dev: true
 
+  /regexp-tree@0.1.27:
+    resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
+    hasBin: true
+    dev: false
+
   /regexp.prototype.flags@1.5.2:
     resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
     engines: {node: '>= 0.4'}
@@ -20792,7 +21064,6 @@ packages:
   /require-from-string@2.0.2:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /require-in-the-middle@7.3.0:
     resolution: {integrity: sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==}
@@ -20813,11 +21084,6 @@ packages:
     resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
     dev: true
 
-  /requireindex@1.2.0:
-    resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==}
-    engines: {node: '>=0.10.5'}
-    dev: true
-
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
@@ -20877,9 +21143,10 @@ packages:
     resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
     hasBin: true
     dependencies:
-      is-core-module: 2.13.1
+      is-core-module: 2.15.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
+    dev: true
 
   /responselike@3.0.0:
     resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}
@@ -20944,6 +21211,7 @@ packages:
     hasBin: true
     dependencies:
       glob: 7.2.3
+    dev: true
 
   /ripemd160@2.0.2:
     resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==}
@@ -21002,15 +21270,6 @@ packages:
     dependencies:
       tslib: 2.7.0
 
-  /safe-array-concat@1.1.0:
-    resolution: {integrity: sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==}
-    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-array-concat@1.1.2:
     resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
     engines: {node: '>=0.4'}
@@ -21019,6 +21278,7 @@ packages:
       get-intrinsic: 1.2.4
       has-symbols: 1.0.3
       isarray: 2.0.5
+    dev: true
 
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
@@ -21033,6 +21293,13 @@ packages:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-regex: 1.1.4
+    dev: true
+
+  /safe-regex@2.1.1:
+    resolution: {integrity: sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==}
+    dependencies:
+      regexp-tree: 0.1.27
+    dev: false
 
   /safe-stable-stringify@2.4.3:
     resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==}
@@ -21106,7 +21373,7 @@ packages:
   /secure-json-parse@2.7.0:
     resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==}
 
-  /semantic-release@21.1.2(typescript@5.3.3):
+  /semantic-release@21.1.2(typescript@5.7.2):
     resolution: {integrity: sha512-kz76azHrT8+VEkQjoCBHE06JNQgTgsC4bT8XfCzb7DHcsk9vG3fqeMVik8h5rcWCYi2Fd+M3bwA7BG8Z8cRwtA==}
     engines: {node: '>=18'}
     hasBin: true
@@ -21117,7 +21384,7 @@ packages:
       '@semantic-release/npm': 10.0.6(semantic-release@21.1.2)
       '@semantic-release/release-notes-generator': 11.0.7(semantic-release@21.1.2)
       aggregate-error: 5.0.0
-      cosmiconfig: 8.3.6(typescript@5.3.3)
+      cosmiconfig: 8.3.6(typescript@5.7.2)
       debug: 4.3.7(supports-color@5.5.0)
       env-ci: 9.1.1
       execa: 8.0.1
@@ -21179,6 +21446,14 @@ packages:
       lru-cache: 6.0.0
     dev: false
 
+  /semver@7.6.0:
+    resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+    dev: false
+
   /semver@7.6.2:
     resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==}
     engines: {node: '>=10'}
@@ -21409,7 +21684,6 @@ packages:
 
   /sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
-    dev: true
 
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
@@ -21461,7 +21735,6 @@ packages:
   /slugify@1.6.6:
     resolution: {integrity: sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==}
     engines: {node: '>=8.0.0'}
-    dev: true
 
   /snake-case@2.1.0:
     resolution: {integrity: sha512-FMR5YoPFwOLuh4rRz92dywJjyKYZNLpMn1R5ujVpIYkbA9p01fq8RMg0FkO4M+Yobt4MjHeLTJVm5xFFBHSV2Q==}
@@ -21484,6 +21757,27 @@ packages:
       type-fest: 2.19.0
     dev: false
 
+  /sonarqube-scanner@4.2.6:
+    resolution: {integrity: sha512-UK6mCGr290bKo6yML9fYOyLrvPkU7vmnYPLvTWVUIQpxiTbkPm4bmPvhcIcSBBH0dN+cKObcrne1E8zuEYl95g==}
+    engines: {node: '>= 18'}
+    hasBin: true
+    dependencies:
+      adm-zip: 0.5.12
+      axios: 1.7.7
+      commander: 12.0.0
+      fs-extra: 11.2.0
+      hpagent: 1.2.0
+      jest-sonar-reporter: 2.0.0
+      node-forge: 1.3.1
+      properties-file: 3.5.4
+      proxy-from-env: 1.1.0
+      semver: 7.6.0
+      slugify: 1.6.6
+      tar-stream: 3.1.7
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
   /sonic-boom@3.3.0:
     resolution: {integrity: sha512-LYxp34KlZ1a2Jb8ZQgFCK3niIHzibdwtwNUWKg0qQRzsDoJ3Gfgkf8KdBTFU3SkejDEIlWwnSnpVdOZIhFMl/g==}
     dependencies:
@@ -21536,7 +21830,7 @@ packages:
   /source-map@0.5.7:
     resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
     engines: {node: '>=0.10.0'}
-    dev: false
+    dev: true
 
   /source-map@0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
@@ -21668,7 +21962,7 @@ packages:
       internal-slot: 1.0.7
     dev: false
 
-  /storybook@8.4.1(prettier@3.3.3):
+  /storybook@8.4.1(prettier@3.4.2):
     resolution: {integrity: sha512-0tfFIFghjho9FtnFoiJMoxhcs2iIdvEF81GTSVnTsDVJrYA84nB+FxN3UY1fT0BcQ8BFlbf+OhSjZL7ufqqWKA==}
     hasBin: true
     peerDependencies:
@@ -21677,8 +21971,8 @@ packages:
       prettier:
         optional: true
     dependencies:
-      '@storybook/core': 8.4.1(prettier@3.3.3)
-      prettier: 3.3.3
+      '@storybook/core': 8.4.1(prettier@3.4.2)
+      prettier: 3.4.2
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -21801,6 +22095,7 @@ packages:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
+    dev: true
 
   /string.prototype.matchall@4.0.11:
     resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==}
@@ -21818,20 +22113,14 @@ packages:
       regexp.prototype.flags: 1.5.2
       set-function-name: 2.0.2
       side-channel: 1.0.6
+    dev: true
 
   /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==}
-    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
+    dev: true
 
   /string.prototype.trim@1.2.9:
     resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
@@ -21841,13 +22130,7 @@ packages:
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-object-atoms: 1.0.0
-
-  /string.prototype.trimend@1.0.7:
-    resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.4
+    dev: true
 
   /string.prototype.trimend@1.0.8:
     resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
@@ -21855,13 +22138,7 @@ packages:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
-
-  /string.prototype.trimstart@1.0.7:
-    resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.4
+    dev: true
 
   /string.prototype.trimstart@1.0.8:
     resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
@@ -21870,6 +22147,7 @@ packages:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
+    dev: true
 
   /string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
@@ -21962,6 +22240,7 @@ packages:
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
+    dev: true
 
   /strnum@1.0.5:
     resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
@@ -22169,7 +22448,7 @@ packages:
     peerDependencies:
       vue: '>=3.2.26 < 4'
     dependencies:
-      vue: 3.4.26(typescript@5.3.3)
+      vue: 3.4.26(typescript@5.7.2)
     dev: false
 
   /symbol-tree@3.2.4:
@@ -22182,6 +22461,7 @@ packages:
     dependencies:
       '@pkgr/utils': 2.3.1
       tslib: 2.7.0
+    dev: true
 
   /synckit@0.9.2:
     resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
@@ -22259,6 +22539,10 @@ packages:
       yallist: 4.0.0
     dev: true
 
+  /teamcity-service-messages@0.1.14:
+    resolution: {integrity: sha512-29aQwaHqm8RMX74u2o/h1KbMLP89FjNiMxD9wbF2BbWOnbM+q+d1sCEC+MqCc4QW3NJykn77OMpTFw/xTHIc0w==}
+    dev: false
+
   /teeny-request@9.0.0:
     resolution: {integrity: sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==}
     engines: {node: '>=14'}
@@ -22342,9 +22626,6 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-
   /thenify-all@1.6.0:
     resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
     engines: {node: '>=0.8'}
@@ -22384,6 +22665,7 @@ packages:
     dependencies:
       globalyzer: 0.1.0
       globrex: 0.1.2
+    dev: true
 
   /tiny-invariant@1.3.1:
     resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
@@ -22511,13 +22793,14 @@ packages:
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     dev: false
 
-  /ts-api-utils@1.3.0(typescript@5.3.3):
+  /ts-api-utils@1.3.0(typescript@5.7.2):
     resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
     engines: {node: '>=16'}
     peerDependencies:
       typescript: '>=4.2.0'
     dependencies:
-      typescript: 5.3.3
+      typescript: 5.7.2
+    dev: true
 
   /ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
@@ -22526,45 +22809,7 @@ packages:
   /ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
-  /ts-jest@29.1.4(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==}
-    engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@jest/transform': ^29.0.0
-      '@jest/types': ^29.0.0
-      babel-jest: ^29.0.0
-      esbuild: '*'
-      jest: ^29.0.0
-      typescript: '>=4.3 <6'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@jest/transform':
-        optional: true
-      '@jest/types':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      '@babel/core': 7.24.5
-      bs-logger: 0.2.6
-      esbuild: 0.21.5
-      fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
-      jest-util: 29.7.0
-      json5: 2.2.3
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.6.2
-      typescript: 5.3.3
-      yargs-parser: 21.1.1
-    dev: true
-
-  /ts-jest@29.2.5(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.3):
+  /ts-jest@29.2.5(@babel/core@7.24.5)(esbuild@0.21.5)(jest@29.7.0)(typescript@5.7.2):
     resolution: {integrity: sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==}
     engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -22591,14 +22836,15 @@ packages:
       '@babel/core': 7.24.5
       bs-logger: 0.2.6
       ejs: 3.1.10
+      esbuild: 0.21.5
       fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0(@types/node@18.18.5)(ts-node@10.9.2)
+      jest: 29.7.0(@types/node@20.17.10)(ts-node@10.9.2)
       jest-util: 29.7.0
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.6.3
-      typescript: 5.3.3
+      typescript: 5.7.2
       yargs-parser: 21.1.1
     dev: true
 
@@ -22618,7 +22864,7 @@ packages:
       code-block-writer: 11.0.3
     dev: true
 
-  /ts-node@10.9.2(@types/node@18.18.5)(typescript@5.3.3):
+  /ts-node@10.9.2(@types/node@20.17.10)(typescript@5.7.2):
     resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
     hasBin: true
     peerDependencies:
@@ -22637,18 +22883,18 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 18.18.5
+      '@types/node': 20.17.10
       acorn: 8.11.3
       acorn-walk: 8.2.0
       arg: 4.1.3
       create-require: 1.1.1
       diff: 4.0.2
       make-error: 1.3.6
-      typescript: 5.3.3
+      typescript: 5.7.2
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
-  /ts-pnp@1.2.0(typescript@5.3.3):
+  /ts-pnp@1.2.0(typescript@5.7.2):
     resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -22657,7 +22903,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      typescript: 5.3.3
+      typescript: 5.7.2
     dev: true
 
   /ts-toolbelt@9.6.0:
@@ -22673,6 +22919,16 @@ packages:
       tsconfig-paths: 4.2.0
     dev: true
 
+  /tsconfig-paths-webpack-plugin@4.2.0:
+    resolution: {integrity: sha512-zbem3rfRS8BgeNK50Zz5SIQgXzLafiHjOwUAvk/38/o1jHn/V5QAgVUcz884or7WYcPaH3N2CIfUc2u0ul7UcA==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      chalk: 4.1.2
+      enhanced-resolve: 5.17.1
+      tapable: 2.2.1
+      tsconfig-paths: 4.2.0
+    dev: false
+
   /tsconfig-paths@3.15.0:
     resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
     dependencies:
@@ -22680,6 +22936,7 @@ packages:
       json5: 1.0.2
       minimist: 1.2.8
       strip-bom: 3.0.0
+    dev: true
 
   /tsconfig-paths@4.2.0:
     resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
@@ -22688,7 +22945,6 @@ packages:
       json5: 2.2.3
       minimist: 1.2.8
       strip-bom: 3.0.0
-    dev: true
 
   /tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
@@ -22704,16 +22960,6 @@ packages:
   /tslib@2.7.0:
     resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==}
 
-  /tsutils@3.21.0(typescript@5.3.3):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
-    dependencies:
-      tslib: 1.14.1
-      typescript: 5.3.3
-    dev: true
-
   /tsx@4.16.0:
     resolution: {integrity: sha512-MPgN+CuY+4iKxGoJNPv+1pyo5YWZAQ5XfsyobUG+zoKG7IkvCPLZDEyoIb8yLS2FcWci1nlxAqmvPlFWD5AFiQ==}
     engines: {node: '>=18.0.0'}
@@ -22808,6 +23054,7 @@ packages:
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
+    dev: true
 
   /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
@@ -22818,10 +23065,6 @@ packages:
     engines: {node: '>=10'}
     dev: false
 
-  /type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-
   /type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
@@ -22878,15 +23121,7 @@ packages:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-typed-array: 1.1.13
-
-  /typed-array-byte-length@1.0.0:
-    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      has-proto: 1.0.1
-      is-typed-array: 1.1.13
+    dev: true
 
   /typed-array-byte-length@1.0.1:
     resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
@@ -22897,17 +23132,7 @@ packages:
       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'}
-    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.1
-      is-typed-array: 1.1.13
+    dev: true
 
   /typed-array-byte-offset@1.0.2:
     resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
@@ -22919,13 +23144,7 @@ packages:
       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:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      is-typed-array: 1.1.13
+    dev: true
 
   /typed-array-length@1.0.6:
     resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
@@ -22937,6 +23156,7 @@ packages:
       has-proto: 1.0.3
       is-typed-array: 1.1.13
       possible-typed-array-names: 1.0.0
+    dev: true
 
   /typedarray-to-buffer@3.1.5:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
@@ -22956,8 +23176,8 @@ packages:
     hasBin: true
     dev: false
 
-  /typescript@5.3.3:
-    resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==}
+  /typescript@5.7.2:
+    resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -22989,6 +23209,7 @@ packages:
       has-bigints: 1.0.2
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
+    dev: true
 
   /unc-path-regex@0.1.2:
     resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
@@ -22999,13 +23220,8 @@ packages:
     resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
     dev: false
 
-  /undici-types@5.25.3:
-    resolution: {integrity: sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==}
-    dev: false
-
   /undici-types@6.19.8:
     resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
-    dev: true
 
   /undici@5.28.4:
     resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==}
@@ -23207,7 +23423,7 @@ packages:
       is-yarn-global: 0.4.1
       latest-version: 7.0.0
       pupa: 3.1.0
-      semver: 7.6.2
+      semver: 7.6.3
       semver-diff: 4.0.0
       xdg-basedir: 5.1.0
     dev: true
@@ -23274,12 +23490,12 @@ packages:
     resolution: {integrity: sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==}
     dev: true
 
-  /use-callback-ref@1.3.2(@types/react@18.2.57)(react@18.2.0):
-    resolution: {integrity: sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==}
+  /use-callback-ref@1.3.3(@types/react@18.2.57)(react@18.2.0):
+    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -23445,7 +23661,7 @@ packages:
     resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
     dev: true
 
-  /vue@3.4.26(typescript@5.3.3):
+  /vue@3.4.26(typescript@5.7.2):
     resolution: {integrity: sha512-bUIq/p+VB+0xrJubaemrfhk1/FiW9iX+pDV+62I/XJ6EkspAO9/DXEjbDFoe8pIfOZBqfk45i9BMc41ptP/uRg==}
     peerDependencies:
       typescript: '*'
@@ -23458,7 +23674,7 @@ packages:
       '@vue/runtime-dom': 3.4.26
       '@vue/server-renderer': 3.4.26(vue@3.4.26)
       '@vue/shared': 3.4.26
-      typescript: 5.3.3
+      typescript: 5.7.2
     dev: false
 
   /w3c-xmlserializer@4.0.0:
@@ -23481,6 +23697,12 @@ packages:
       glob-to-regexp: 0.4.1
       graceful-fs: 4.2.11
 
+  /watskeburt@4.2.2:
+    resolution: {integrity: sha512-AOCg1UYxWpiHW1tUwqpJau8vzarZYTtzl2uu99UptBmbzx6kOzCGMfRLF6KIRX4PYekmryn89MzxlRNkL66YyA==}
+    engines: {node: ^18||>=20}
+    hasBin: true
+    dev: false
+
   /wcwidth@1.0.1:
     resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
     dependencies:
@@ -23501,6 +23723,10 @@ packages:
     engines: {node: '>= 14'}
     dev: false
 
+  /web-vitals@4.2.4:
+    resolution: {integrity: sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==}
+    dev: false
+
   /webcrypto-core@1.8.0:
     resolution: {integrity: sha512-kR1UQNH8MD42CYuLzvibfakG5Ew5seG85dMMoAM/1LqvckxaF6pUiidLuraIu4V+YCIFabYecUZAW0TuxAoaqw==}
     dependencies:
@@ -23652,7 +23878,8 @@ packages:
       isarray: 2.0.5
       which-boxed-primitive: 1.0.2
       which-collection: 1.0.1
-      which-typed-array: 1.1.14
+      which-typed-array: 1.1.15
+    dev: true
 
   /which-collection@1.0.1:
     resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==}
diff --git a/release.config.js b/release.config.cjs
similarity index 100%
rename from release.config.js
rename to release.config.cjs
diff --git a/sonar-project.properties b/sonar-project.properties
index fe5f8b69b..5d3c422c8 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,17 +2,29 @@ sonar.projectKey=oaknational_oak-ai-lesson-assistant
 sonar.organization=oaknational
 
 sonar.projectName=oak-ai-lesson-assistant
-sonar.projectVersion=v1.41.1
 sonar.projectDescription=Oak National Academy AI Web Application
 sonar.links.homepage=https://labs.thenational.academy/
 
 sonar.sources=.
 
 sonar.exclusions=\
-  apps/nextjs/src/lib/avo/Avo.ts
-  pnpm-lock.yaml
+  apps/nextjs/src/lib/avo/Avo.ts,\
+  pnpm-lock.yaml,\
+  apps/nextjs/.storybook/public/mockServiceWorker.js,\
+  **/*.py,\
+  **/*.sql
+
 
 sonar.cpd.exclusions=\
   **/*.test.ts, \
   **/*.fixture.ts, \
-  **/*.json
+  apps/nextjs/jest.config.js \
+  **/*.json \
+  **/*.stories.ts \
+  **/*.stories.tsx 
+
+sonar.tests=.
+sonar.test.inclusions=**/*.test.ts
+sonar.javascript.lcov.reportPaths=packages/**/coverage/lcov.info,apps/nextjs/coverage/lcov.info
+
+sonar.language=ts,tsx,js,jsx,html,css
diff --git a/tsconfig.json b/tsconfig.json
index a731459f5..0bf2c4cd9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,8 +14,9 @@
     "noUncheckedIndexedAccess": true,
     "incremental": true,
     "types": ["jest", "node"],
-    "moduleResolution": "node",
-    "esModuleInterop": true
-  },
-  "include": [".eslintrc.cjs"]
+    "moduleResolution": "bundler",
+    "esModuleInterop": true,
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force"
+  }
 }
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 1836b0284..70557fa2a 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -9,13 +9,15 @@
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
     "noUncheckedIndexedAccess": true,
     "incremental": true,
-    "types": ["jest"]
+    "types": ["jest"],
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force"
   },
   "include": [".eslintrc.cjs"]
 }
diff --git a/turbo.json b/turbo.json
index 45f42d4e1..610176972 100644
--- a/turbo.json
+++ b/turbo.json
@@ -67,7 +67,6 @@
       "cache": false
     },
     "type-check": {
-      "dependsOn": ["^db-generate"],
       "cache": false
     },
     "test": {
@@ -84,6 +83,9 @@
       "cache": false,
       "env": ["TEST_USER_EMAIL", "TEST_USER_PASSWORD"]
     },
+    "test-coverage": {
+      "cache": false
+    },
     "storybook": {
       "cache": false
     }